Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1d14a5b
Add support for `import defer` proposal
ryzokuken Jul 8, 2024
7136718
Update AST to unify `type` with other modifiers
nicolo-ribaudo Dec 19, 2024
6967224
Add test for comments around `defer`
nicolo-ribaudo Dec 19, 2024
2346fa5
Remove unnecessary backwards compat check
nicolo-ribaudo Jan 16, 2025
e3a1a18
Add support for `import.defer(...)`
nicolo-ribaudo Jan 16, 2025
c3bcd0b
Also support `module: NodeNext`
nicolo-ribaudo Jan 17, 2025
8d4fd08
`aren't` -> `are not`
nicolo-ribaudo Jan 17, 2025
7cdc422
ImportPhaseModifier -> ImportPhaseModifierSyntaxKind
nicolo-ribaudo Jan 17, 2025
994ec08
Move import clause checks to checker.ts
nicolo-ribaudo Jan 17, 2025
95183c4
Report `'(' expected` for import.defer
nicolo-ribaudo Jan 17, 2025
33309e8
Make meta property error localizable
nicolo-ribaudo Jan 17, 2025
00adf6e
Move `import.defer` checks to checker.ts
nicolo-ribaudo Jan 17, 2025
cd045bb
Unify tests testing different values of `module`
nicolo-ribaudo Jan 17, 2025
fc0908f
Move `errorType` for `import.defer` handling
nicolo-ribaudo Jan 17, 2025
dec1011
Do not consider `import.defer` in `import.defer(...)` as an expression
nicolo-ribaudo Jan 17, 2025
8d2451a
fmt
nicolo-ribaudo Jan 17, 2025
c485777
Sort tokens alphabetically
nicolo-ribaudo Jan 17, 2025
706bb58
Remove unused baselines
nicolo-ribaudo Jan 20, 2025
bfbcc3f
Properly resolve specifiers in `import.defer(...)`
nicolo-ribaudo Jan 20, 2025
bad45a3
rbuckton review
nicolo-ribaudo Feb 5, 2025
5f54ced
Add test for jsdoc (unsupported)
nicolo-ribaudo Jun 5, 2025
1e445bf
Strip `defer` from dts
nicolo-ribaudo Jun 5, 2025
1886e24
Use `LastKeyword` for `LastContextualKeyword`
nicolo-ribaudo Jun 5, 2025
ffcfd9a
Add test for `typeof import.defer` (unsupported)
nicolo-ribaudo Jun 5, 2025
b352c0d
Drop support for `nodenext`, and allow when `preserve`
nicolo-ribaudo Jun 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
aren't -> are not
  • Loading branch information
nicolo-ribaudo committed Jun 5, 2025
commit 8d4fd088061d6239c5c67d00863b19281058a9ce
4 changes: 2 additions & 2 deletions src/compiler/diagnosticMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -8452,11 +8452,11 @@
"category": "Error",
"code": 18057
},
"Default imports aren't allowed for deferred imports.": {
"Default imports are not allowed in a deferred import.": {
"category": "Error",
"code": 18058
},
"Named imports aren't allowed for deferred imports.": {
"Named imports are not allowed in a deferred import.": {
"category": "Error",
"code": 18059
},
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8392,7 +8392,7 @@ namespace Parser {
phaseModifier = SyntaxKind.DeferKeyword;
identifier = undefined;
if (isIdentifier()) {
parseErrorAtCurrentToken(Diagnostics.Default_imports_aren_t_allowed_for_deferred_imports);
parseErrorAtCurrentToken(Diagnostics.Default_imports_are_not_allowed_in_a_deferred_import);
identifier = parseIdentifier();
}
}
Expand Down Expand Up @@ -8507,7 +8507,7 @@ namespace Parser {
}
else {
if (phaseModifier === SyntaxKind.DeferKeyword) {
parseErrorAtCurrentToken(Diagnostics.Named_imports_aren_t_allowed_for_deferred_imports);
parseErrorAtCurrentToken(Diagnostics.Named_imports_are_not_allowed_in_a_deferred_import);
}
namedBindings = parseNamedImportsOrExports(SyntaxKind.NamedImports);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
b.ts(1,14): error TS18058: Default imports aren't allowed for deferred imports.
b.ts(1,14): error TS18058: Default imports are not allowed in a deferred import.


==== a.ts (0 errors) ====
Expand All @@ -9,6 +9,6 @@ b.ts(1,14): error TS18058: Default imports aren't allowed for deferred imports.
==== b.ts (1 errors) ====
import defer foo from "a";
~~~
!!! error TS18058: Default imports aren't allowed for deferred imports.
!!! error TS18058: Default imports are not allowed in a deferred import.

foo();
4 changes: 2 additions & 2 deletions tests/baselines/reference/importDeferInvalidNamed.errors.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
b.ts(1,14): error TS18059: Named imports aren't allowed for deferred imports.
b.ts(1,14): error TS18059: Named imports are not allowed in a deferred import.


==== a.ts (0 errors) ====
Expand All @@ -9,6 +9,6 @@ b.ts(1,14): error TS18059: Named imports aren't allowed for deferred imports.
==== b.ts (1 errors) ====
import defer { foo } from "a";
~
!!! error TS18059: Named imports aren't allowed for deferred imports.
!!! error TS18059: Named imports are not allowed in a deferred import.

foo();
4 changes: 2 additions & 2 deletions tests/baselines/reference/importDeferTypeConflict2.errors.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
b.ts(1,14): error TS18058: Default imports aren't allowed for deferred imports.
b.ts(1,14): error TS18058: Default imports are not allowed in a deferred import.
b.ts(1,19): error TS1005: 'from' expected.
b.ts(1,19): error TS1141: String literal expected.
b.ts(1,24): error TS1005: ';' expected.
Expand All @@ -15,7 +15,7 @@ b.ts(1,28): error TS2304: Cannot find name 'from'.
==== b.ts (7 errors) ====
import defer type * as ns1 from "a";
~~~~
!!! error TS18058: Default imports aren't allowed for deferred imports.
!!! error TS18058: Default imports are not allowed in a deferred import.
~
!!! error TS1005: 'from' expected.
~~~~
Expand Down