Skip to content

Commit b1a728f

Browse files
author
Andy Hanson
committed
Only add suggestion for modules
1 parent 64b595e commit b1a728f

5 files changed

+23
-7
lines changed

src/services/suggestionDiagnostics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace ts {
3232
}
3333
check(sourceFile);
3434

35-
if (!isJsFile) {
35+
if (!isJsFile && sourceFile.externalModuleIndicator) {
3636
for (const statement of sourceFile.statements) {
3737
if (isVariableStatement(statement) &&
3838
statement.declarationList.flags & NodeFlags.Const &&
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/// <reference path='fourslash.ts' />
22

3-
// @Filename: /a.ts
3+
////export {};
44
////const a = [|require("a")|];
5+
////a;
56

67
verify.getSuggestionDiagnostics([{
78
message: "'require' call may be converted to an import.",
@@ -11,5 +12,8 @@ verify.getSuggestionDiagnostics([{
1112
verify.codeFix({
1213
description: "Convert 'require' to 'import'",
1314
newFileContent:
14-
`import a = require("a");`,
15+
// TODO: GH#23781
16+
`export {};
17+
import a = require("a");
18+
a;`,
1519
});
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
/// <reference path='fourslash.ts' />
22

3-
// @Filename: /a.ts
3+
////export {};
44
////const a = [|require("a")|];
55
////const b = [|require("b")|];
66

77
verify.codeFixAll({
88
fixId: "requireInTs",
99
fixAllDescription: "Convert all 'require' to 'import'",
1010
newFileContent:
11-
`import a = require("a");
11+
// TODO: GH#23781
12+
`export {};
13+
import a = require("a");
1214
import b = require("b");`,
1315
});

tests/cases/fourslash/codeFixRequireInTs_allowSyntheticDefaultImports.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
// @allowSyntheticDefaultImports: true
44

5-
// @Filename: /a.ts
5+
////export {};
66
////const a = [|require("a")|];
7+
////a;
78

89
verify.codeFix({
910
description: "Convert 'require' to 'import'",
10-
newFileContent: `import a from "a";`,
11+
newFileContent:
12+
// TODO: GH#23781
13+
`export {};
14+
import a from "a";
15+
a;`,
1116
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference path='fourslash.ts' />
2+
3+
////const a = [|require("a")|];
4+
5+
verify.getSuggestionDiagnostics([]);

0 commit comments

Comments
 (0)