Skip to content

Improve error for unclosed imports and exports #54634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 29, 2023
Merged

Improve error for unclosed imports and exports #54634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8adea4
Improve error for unclosed imports and exports
Jack-Works Jun 13, 2023
27d107e
fix: error
Jack-Works Jun 13, 2023
6eb6fa1
Merge branch 'main' into improve-error-for-unclosed-import-export
sandersn Jun 29, 2023
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
14 changes: 13 additions & 1 deletion src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,6 +2869,11 @@ namespace Parser {
case ParsingContext.HeritageClauses:
return isHeritageClause();
case ParsingContext.ImportOrExportSpecifiers:
// bail out if the next token is [FromKeyword StringLiteral].
// That means we're in something like `import { from "mod"`. Stop here can give better error message.
if (token() === SyntaxKind.FromKeyword && lookAhead(nextTokenIsStringLiteral)) {
return false;
}
return tokenIsIdentifierOrKeyword(token());
case ParsingContext.JsxAttributes:
return tokenIsIdentifierOrKeyword(token()) || token() === SyntaxKind.OpenBraceToken;
Expand Down Expand Up @@ -3390,7 +3395,11 @@ namespace Parser {
case ParsingContext.TypeArguments: return parseErrorAtCurrentToken(Diagnostics.Type_argument_expected);
case ParsingContext.TupleElementTypes: return parseErrorAtCurrentToken(Diagnostics.Type_expected);
case ParsingContext.HeritageClauses: return parseErrorAtCurrentToken(Diagnostics.Unexpected_token_expected);
case ParsingContext.ImportOrExportSpecifiers: return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
case ParsingContext.ImportOrExportSpecifiers:
if (token() === SyntaxKind.FromKeyword) {
return parseErrorAtCurrentToken(Diagnostics._0_expected, "}");
}
return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
case ParsingContext.JsxAttributes: return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
case ParsingContext.JsxChildren: return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
case ParsingContext.AssertEntries: return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected); // AssertionKey.
Expand Down Expand Up @@ -7413,6 +7422,9 @@ namespace Parser {
}
}

function nextTokenIsStringLiteral() {
return nextToken() === SyntaxKind.StringLiteral;
}
function nextTokenIsIdentifierOrStringLiteralOnSameLine() {
nextToken();
return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token() === SyntaxKind.StringLiteral);
Expand Down
35 changes: 10 additions & 25 deletions tests/baselines/reference/unclosedExportClause01.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,28 @@
t2.ts(1,13): error TS2305: Module '"./t1"' has no exported member 'from'.
t2.ts(1,18): error TS1005: ',' expected.
t3.ts(1,10): error TS2305: Module '"./t1"' has no exported member 'from'.
t3.ts(1,15): error TS1005: ',' expected.
t2.ts(1,13): error TS1005: '}' expected.
t3.ts(1,10): error TS1005: '}' expected.
t4.ts(1,17): error TS1005: ',' expected.
t4.ts(1,17): error TS2305: Module '"./t1"' has no exported member 'from'.
t4.ts(1,22): error TS1005: ',' expected.
t5.ts(1,18): error TS2305: Module '"./t1"' has no exported member 'from'.
t5.ts(1,23): error TS1005: ',' expected.
t5.ts(1,18): error TS1005: '}' expected.


==== t1.ts (0 errors) ====
export var x = "x";

==== t2.ts (2 errors) ====
==== t2.ts (1 errors) ====
export { x, from "./t1"
~~~~
!!! error TS2305: Module '"./t1"' has no exported member 'from'.
~~~~~~
!!! error TS1005: ',' expected.
!!! error TS1005: '}' expected.

==== t3.ts (2 errors) ====
==== t3.ts (1 errors) ====
export { from "./t1"
~~~~
!!! error TS2305: Module '"./t1"' has no exported member 'from'.
~~~~~~
!!! error TS1005: ',' expected.
!!! error TS1005: '}' expected.

==== t4.ts (3 errors) ====
==== t4.ts (1 errors) ====
export { x as a from "./t1"
~~~~
!!! error TS1005: ',' expected.
~~~~
!!! error TS2305: Module '"./t1"' has no exported member 'from'.
~~~~~~
!!! error TS1005: ',' expected.

==== t5.ts (2 errors) ====
==== t5.ts (1 errors) ====
export { x as a, from "./t1"
~~~~
!!! error TS2305: Module '"./t1"' has no exported member 'from'.
~~~~~~
!!! error TS1005: ',' expected.
!!! error TS1005: '}' expected.
12 changes: 3 additions & 9 deletions tests/baselines/reference/unclosedExportClause01.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,21 @@ exports.x = "x";
//// [t2.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.x = void 0;
exports.x = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "x", { enumerable: true, get: function () { return t1_1.x; } });
Object.defineProperty(exports, "from", { enumerable: true, get: function () { return t1_1.from; } });
//// [t3.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "from", { enumerable: true, get: function () { return t1_1.from; } });
//// [t4.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.a = void 0;
exports.a = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "a", { enumerable: true, get: function () { return t1_1.x; } });
Object.defineProperty(exports, "from", { enumerable: true, get: function () { return t1_1.from; } });
//// [t5.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.a = void 0;
exports.a = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "a", { enumerable: true, get: function () { return t1_1.x; } });
Object.defineProperty(exports, "from", { enumerable: true, get: function () { return t1_1.from; } });
5 changes: 1 addition & 4 deletions tests/baselines/reference/unclosedExportClause01.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,18 @@ export var x = "x";
=== t2.ts ===
export { x, from "./t1"
>x : Symbol(x, Decl(t2.ts, 0, 8))
>from : Symbol(from, Decl(t2.ts, 0, 11))

=== t3.ts ===

export { from "./t1"
>from : Symbol(from, Decl(t3.ts, 0, 8))

=== t4.ts ===
export { x as a from "./t1"
>x : Symbol(x, Decl(t1.ts, 0, 10))
>a : Symbol(a, Decl(t4.ts, 0, 8))
>from : Symbol(from, Decl(t4.ts, 0, 15))

=== t5.ts ===
export { x as a, from "./t1"
>x : Symbol(x, Decl(t1.ts, 0, 10))
>a : Symbol(a, Decl(t5.ts, 0, 8))
>from : Symbol(from, Decl(t5.ts, 0, 16))

5 changes: 1 addition & 4 deletions tests/baselines/reference/unclosedExportClause01.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,18 @@ export var x = "x";
=== t2.ts ===
export { x, from "./t1"
>x : string
>from : any

=== t3.ts ===

export { from "./t1"
>from : any

=== t4.ts ===
export { x as a from "./t1"
>x : string
>a : string
>from : any

=== t5.ts ===
export { x as a, from "./t1"
>x : string
>a : string
>from : any

46 changes: 11 additions & 35 deletions tests/baselines/reference/unclosedExportClause02.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,32 @@
t2.ts(1,10): error TS2304: Cannot find name 'x'.
t2.ts(1,13): error TS2304: Cannot find name 'from'.
t2.ts(2,5): error TS1005: ',' expected.
t3.ts(1,10): error TS2304: Cannot find name 'from'.
t3.ts(2,5): error TS1005: ',' expected.
t4.ts(1,10): error TS2304: Cannot find name 'x'.
t2.ts(1,13): error TS1005: '}' expected.
t3.ts(1,10): error TS1005: '}' expected.
t4.ts(1,17): error TS1005: ',' expected.
t4.ts(1,17): error TS2304: Cannot find name 'from'.
t4.ts(2,5): error TS1005: ',' expected.
t5.ts(1,10): error TS2304: Cannot find name 'x'.
t5.ts(1,18): error TS2304: Cannot find name 'from'.
t5.ts(2,5): error TS1005: ',' expected.
t5.ts(1,18): error TS1005: '}' expected.


==== t1.ts (0 errors) ====
export var x = "x";

==== t2.ts (3 errors) ====
==== t2.ts (1 errors) ====
export { x, from
~
!!! error TS2304: Cannot find name 'x'.
~~~~
!!! error TS2304: Cannot find name 'from'.
!!! error TS1005: '}' expected.
"./t1";
~~~~~~
!!! error TS1005: ',' expected.

==== t3.ts (2 errors) ====
==== t3.ts (1 errors) ====
export { from
~~~~
!!! error TS2304: Cannot find name 'from'.
!!! error TS1005: '}' expected.
"./t1";
~~~~~~
!!! error TS1005: ',' expected.

==== t4.ts (4 errors) ====
==== t4.ts (1 errors) ====
export { x as a from
~
!!! error TS2304: Cannot find name 'x'.
~~~~
!!! error TS1005: ',' expected.
~~~~
!!! error TS2304: Cannot find name 'from'.
"./t1";
~~~~~~
!!! error TS1005: ',' expected.

==== t5.ts (3 errors) ====
==== t5.ts (1 errors) ====
export { x as a, from
~
!!! error TS2304: Cannot find name 'x'.
~~~~
!!! error TS2304: Cannot find name 'from'.
"./t1";
~~~~~~
!!! error TS1005: ',' expected.
!!! error TS1005: '}' expected.
"./t1";
17 changes: 9 additions & 8 deletions tests/baselines/reference/unclosedExportClause02.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,21 @@ exports.x = "x";
//// [t2.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.x = void 0;
"./t1";
exports.x = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "x", { enumerable: true, get: function () { return t1_1.x; } });
//// [t3.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = void 0;
"./t1";
//// [t4.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.a = void 0;
"./t1";
exports.a = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "a", { enumerable: true, get: function () { return t1_1.x; } });
//// [t5.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.from = exports.a = void 0;
"./t1";
exports.a = void 0;
var t1_1 = require("./t1");
Object.defineProperty(exports, "a", { enumerable: true, get: function () { return t1_1.x; } });
8 changes: 3 additions & 5 deletions tests/baselines/reference/unclosedExportClause02.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,24 @@ export var x = "x";
=== t2.ts ===
export { x, from
>x : Symbol(x, Decl(t2.ts, 0, 8))
>from : Symbol(from, Decl(t2.ts, 0, 11))

"./t1";

=== t3.ts ===
export { from
>from : Symbol(from, Decl(t3.ts, 0, 8))

export { from
"./t1";

=== t4.ts ===
export { x as a from
>x : Symbol(x, Decl(t1.ts, 0, 10))
>a : Symbol(a, Decl(t4.ts, 0, 8))
>from : Symbol(from, Decl(t4.ts, 0, 15))

"./t1";

=== t5.ts ===
export { x as a, from
>x : Symbol(x, Decl(t1.ts, 0, 10))
>a : Symbol(a, Decl(t5.ts, 0, 8))
>from : Symbol(from, Decl(t5.ts, 0, 16))

"./t1";
21 changes: 6 additions & 15 deletions tests/baselines/reference/unclosedExportClause02.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,25 @@ export var x = "x";

=== t2.ts ===
export { x, from
>x : any
>from : any
>x : string

"./t1";
>"./t1" : "./t1"

=== t3.ts ===
export { from
>from : any

export { from
"./t1";
>"./t1" : "./t1"

=== t4.ts ===
export { x as a from
>x : any
>a : any
>from : any
>x : string
>a : string

"./t1";
>"./t1" : "./t1"

=== t5.ts ===
export { x as a, from
>x : any
>a : any
>from : any
>x : string
>a : string

"./t1";
>"./t1" : "./t1"