Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 21 additions & 10 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52790,17 +52790,28 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

const blockScopeFlags = declarationList.flags & NodeFlags.BlockScoped;
if ((blockScopeFlags === NodeFlags.Using || blockScopeFlags === NodeFlags.AwaitUsing) && isForInStatement(declarationList.parent)) {
return grammarErrorOnNode(
declarationList,
blockScopeFlags === NodeFlags.Using ?
Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_using_declaration :
Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_an_await_using_declaration,
);
}
if (blockScopeFlags === NodeFlags.Using || blockScopeFlags === NodeFlags.AwaitUsing) {
if (isForInStatement(declarationList.parent)) {
return grammarErrorOnNode(
declarationList,
blockScopeFlags === NodeFlags.Using ?
Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_using_declaration :
Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_an_await_using_declaration,
);
}

if (blockScopeFlags === NodeFlags.AwaitUsing) {
return checkAwaitGrammar(declarationList);
if (declarationList.flags & NodeFlags.Ambient) {
return grammarErrorOnNode(
declarationList,
blockScopeFlags === NodeFlags.Using ?
Diagnostics.using_declarations_are_not_allowed_in_ambient_contexts :
Diagnostics.await_using_declarations_are_not_allowed_in_ambient_contexts,
);
}

if (blockScopeFlags === NodeFlags.AwaitUsing) {
return checkAwaitGrammar(declarationList);
}
}

return false;
Expand Down
8 changes: 8 additions & 0 deletions src/compiler/diagnosticMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,14 @@
"category": "Error",
"code": 1544
},
"'using' declarations are not allowed in ambient contexts.": {
"category": "Error",
"code": 1545
},
"'await using' declarations are not allowed in ambient contexts.": {
"category": "Error",
"code": 1546
},

"The types of '{0}' are incompatible between these types.": {
"category": "Error",
Expand Down
24 changes: 24 additions & 0 deletions tests/baselines/reference/awaitUsingDeclarations.16.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
awaitUsingDeclarations.16.ts(2,5): error TS1546: 'await using' declarations are not allowed in ambient contexts.
awaitUsingDeclarations.16.ts(3,5): error TS1546: 'await using' declarations are not allowed in ambient contexts.
awaitUsingDeclarations.16.ts(6,5): error TS1546: 'await using' declarations are not allowed in ambient contexts.
awaitUsingDeclarations.16.ts(7,5): error TS1546: 'await using' declarations are not allowed in ambient contexts.


==== awaitUsingDeclarations.16.ts (4 errors) ====
declare namespace N {
await using x: { [Symbol.asyncDispose](): Promise<void> };
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS1546: 'await using' declarations are not allowed in ambient contexts.
await using y: null;
~~~~~~~~~~~~~~~~~~~
!!! error TS1546: 'await using' declarations are not allowed in ambient contexts.
}
declare module 'M' {
await using x: { [Symbol.asyncDispose](): Promise<void> };
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS1546: 'await using' declarations are not allowed in ambient contexts.
await using y: null;
~~~~~~~~~~~~~~~~~~~
!!! error TS1546: 'await using' declarations are not allowed in ambient contexts.
}

14 changes: 14 additions & 0 deletions tests/baselines/reference/awaitUsingDeclarations.16.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/awaitUsingDeclarations.16.ts] ////

//// [awaitUsingDeclarations.16.ts]
declare namespace N {
await using x: { [Symbol.asyncDispose](): Promise<void> };
await using y: null;
}
declare module 'M' {
await using x: { [Symbol.asyncDispose](): Promise<void> };
await using y: null;
}


//// [awaitUsingDeclarations.16.js]
24 changes: 24 additions & 0 deletions tests/baselines/reference/usingDeclarations.16.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
usingDeclarations.16.ts(2,5): error TS1545: 'using' declarations are not allowed in ambient contexts.
usingDeclarations.16.ts(3,5): error TS1545: 'using' declarations are not allowed in ambient contexts.
usingDeclarations.16.ts(6,5): error TS1545: 'using' declarations are not allowed in ambient contexts.
usingDeclarations.16.ts(7,5): error TS1545: 'using' declarations are not allowed in ambient contexts.


==== usingDeclarations.16.ts (4 errors) ====
declare namespace N {
using x: { [Symbol.dispose](): void };
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS1545: 'using' declarations are not allowed in ambient contexts.
using y: null;
~~~~~~~~~~~~~
!!! error TS1545: 'using' declarations are not allowed in ambient contexts.
}
declare module 'M' {
using x: { [Symbol.dispose](): void };
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS1545: 'using' declarations are not allowed in ambient contexts.
using y: null;
~~~~~~~~~~~~~
!!! error TS1545: 'using' declarations are not allowed in ambient contexts.
}

14 changes: 14 additions & 0 deletions tests/baselines/reference/usingDeclarations.16.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarations.16.ts] ////

//// [usingDeclarations.16.ts]
declare namespace N {
using x: { [Symbol.dispose](): void };
using y: null;
}
declare module 'M' {
using x: { [Symbol.dispose](): void };
using y: null;
}


//// [usingDeclarations.16.js]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @target: esnext
// @module: esnext
// @lib: esnext
// @noTypesAndSymbols: true

declare namespace N {
await using x: { [Symbol.asyncDispose](): Promise<void> };
await using y: null;
}
declare module 'M' {
await using x: { [Symbol.asyncDispose](): Promise<void> };
await using y: null;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @target: esnext
// @module: esnext
// @lib: esnext
// @noTypesAndSymbols: true

declare namespace N {
using x: { [Symbol.dispose](): void };
using y: null;
}
declare module 'M' {
using x: { [Symbol.dispose](): void };
using y: null;
}