Skip to content

Commit 05b5e63

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/inference-from-context-sensitive-return
2 parents a14bad4 + b33d372 commit 05b5e63

File tree

12,065 files changed

+172096
-141940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

12,065 files changed

+172096
-141940
lines changed

.github/copilot-instructions.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ npx hereby local # Build the compiler into built/local
1515
npx hereby clean # Delete the built compiler
1616
npx hereby tests # Build the test infrastructure
1717
npx hereby runtests # Run all tests
18-
npx hereby runtests-parallel # Run tests in parallel (recommended)
18+
npx hereby runtests-parallel # Run tests in parallel 🚨 MANDATORY BEFORE FINISHING!
1919
npx hereby runtests --runner=fourslash # Run only fourslash tests
2020
npx hereby runtests --runner=compiler # Run only compiler tests
2121
npx hereby runtests --tests=<testPath> # Run specific test
2222
npx hereby baseline-accept # Accept new test baselines
23-
npx hereby lint # Run eslint
24-
npx hereby format # Run code formatting
23+
npx hereby lint # Run eslint 🚨 MANDATORY BEFORE FINISHING!
24+
npx hereby format # Run code formatting 🚨 MANDATORY BEFORE FINISHING!
2525
```
2626

2727
## Fourslash Test Syntax Guide
@@ -258,10 +258,22 @@ npx hereby runtests --tests=tests/cases/fourslash/completion*.ts
258258

259259
## Important Guidelines
260260

261+
### 🚨 CRITICAL: Before Finishing Your Work 🚨
262+
263+
**THESE STEPS ARE MANDATORY BEFORE COMMITTING/PUSHING ANY CHANGES:**
264+
265+
1. **MUST RUN:** `npx hereby runtests-parallel` (even though it takes 10-15 minutes)
266+
2. **MUST RUN:** `npx hereby lint` and fix ALL lint issues
267+
3. **MUST RUN:** `npx hereby format` as the final step
268+
269+
**❌ PRs that fail these checks will be rejected without review.**
270+
261271
### Keeping Things Tidy
262272

263-
- Once you think you're done, run `npx hereby lint` and fix any issues
264-
- Then always run `npx hereby format` as your last step
273+
- You can assume lint, tests, and formatting are clean on a fresh clone
274+
- Only run these verification steps AFTER making changes to code
275+
- Run `npx hereby lint` and fix ALL issues after making changes
276+
- Run `npx hereby format` as your final step after making changes
265277

266278
### Test Locations
267279

@@ -317,11 +329,14 @@ When fixing bugs or implementing features, follow this workflow:
317329
- Once you've got the basics figured out, enhance your test to cover edge cases and other variations
318330
- Run the test again and commit the baseline diff along with the test edit
319331

320-
5. **Run all other tests to ensure you didn't break anything**
321-
- Run `npx hereby runtests-parallel` and wait for it to finish (10-15 minutes is normal!)
332+
5. **🚨 MANDATORY: Run all other tests to ensure you didn't break anything**
333+
- **REQUIRED:** Run `npx hereby runtests-parallel` and wait for it to finish (10-15 minutes is normal!)
334+
- **THIS STEP CANNOT BE SKIPPED** - patience is essential!
322335
- Some collateral baseline changes are normal, but review for correctness
323336
- Put these diffs in another commit
324337

325-
6. **Always format and lint**
326-
- Don't forget to run `npx hereby lint` and `npx hereby format` before you're done
338+
6. **🚨 MANDATORY: Lint and format your changes**
339+
- **REQUIRED:** Run `npx hereby lint` and fix ALL issues
340+
- **REQUIRED:** Run `npx hereby format` before you're done
341+
- **YOU CANNOT FINISH WITHOUT THESE STEPS**
327342
- Double-check your line endings. Source files in this repo typically use CRLF line endings. Fix all line endings to be consistent before you wrap up

.github/pr_owners.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ jakebailey
99
DanielRosenwasser
1010
navya9singh
1111
iisaduan
12+
johnfav03

.github/workflows/accept-baselines-fix-lints.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Accept Baselines and Fix Lints
1+
name: Accept Baselines, Fix Lints, and Format
22

33
on:
44
workflow_dispatch: {}
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2121
with:
2222
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
23+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version: 'lts/*'
2626

@@ -32,8 +32,9 @@ jobs:
3232
git rm -r --quiet tests/baselines/reference
3333
npx hereby runtests-parallel --ci --fix || true
3434
npx hereby baseline-accept
35+
npx hereby format
3536
git add ./src
3637
git add ./tests/baselines/reference
3738
git diff --cached
38-
git commit -m "Update Baselines and/or Applied Lint Fixes"
39+
git commit -m "Update Baselines, Applied Lint Fixes, and/or Formatted"
3940
git push

0 commit comments

Comments
 (0)