Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Report every instance of TS1208 (#50101)
* Report every instance of TS1208

* Test case for multiple cases of TS1208

* Add test case for isolatedModules with moduleDetection forced
  • Loading branch information
wnayes committed Sep 2, 2022
1 parent 62f980a commit fd3a84c
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/compiler/program.ts
Expand Up @@ -3535,11 +3535,12 @@ namespace ts {
createDiagnosticForOptionName(Diagnostics.Option_preserveConstEnums_cannot_be_disabled_when_isolatedModules_is_enabled, "preserveConstEnums", "isolatedModules");
}

const firstNonExternalModuleSourceFile = find(files, f => !isExternalModule(f) && !isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== ScriptKind.JSON);
if (firstNonExternalModuleSourceFile) {
const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length,
Diagnostics._0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module, getBaseFileName(firstNonExternalModuleSourceFile.fileName)));
for (const file of files) {
if (!isExternalModule(file) && !isSourceFileJS(file) && !file.isDeclarationFile && file.scriptKind !== ScriptKind.JSON) {
const span = getErrorSpanForNode(file, file);
programDiagnostics.add(createFileDiagnostic(file, span.start, span.length,
Diagnostics._0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module, getBaseFileName(file.fileName)));
}
}
}
else if (firstNonAmbientExternalModuleSourceFile && languageVersion < ScriptTarget.ES2015 && options.module === ModuleKind.None) {
Expand Down
@@ -0,0 +1,6 @@
//// [file1.ts]
var x;

//// [file1.js]
var x;
export {};
@@ -0,0 +1,4 @@
=== tests/cases/compiler/file1.ts ===
var x;
>x : Symbol(x, Decl(file1.ts, 0, 3))

@@ -0,0 +1,4 @@
=== tests/cases/compiler/file1.ts ===
var x;
>x : any

@@ -0,0 +1,20 @@
tests/cases/compiler/file1.ts(1,1): error TS1208: 'file1.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
tests/cases/compiler/file2.ts(1,1): error TS1208: 'file2.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
tests/cases/compiler/file3.ts(1,1): error TS1208: 'file3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.


==== tests/cases/compiler/file1.ts (1 errors) ====
var x;
~~~
!!! error TS1208: 'file1.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.

==== tests/cases/compiler/file2.ts (1 errors) ====
var y;
~~~
!!! error TS1208: 'file2.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.

==== tests/cases/compiler/file3.ts (1 errors) ====
var z;
~~~
!!! error TS1208: 'file3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.

@@ -0,0 +1,18 @@
//// [tests/cases/compiler/isolatedModulesNoExternalModuleMultiple.ts] ////

//// [file1.ts]
var x;

//// [file2.ts]
var y;

//// [file3.ts]
var z;


//// [file1.js]
var x;
//// [file2.js]
var y;
//// [file3.js]
var z;
@@ -0,0 +1,12 @@
=== tests/cases/compiler/file1.ts ===
var x;
>x : Symbol(x, Decl(file1.ts, 0, 3))

=== tests/cases/compiler/file2.ts ===
var y;
>y : Symbol(y, Decl(file2.ts, 0, 3))

=== tests/cases/compiler/file3.ts ===
var z;
>z : Symbol(z, Decl(file3.ts, 0, 3))

@@ -0,0 +1,12 @@
=== tests/cases/compiler/file1.ts ===
var x;
>x : any

=== tests/cases/compiler/file2.ts ===
var y;
>y : any

=== tests/cases/compiler/file3.ts ===
var z;
>z : any

6 changes: 6 additions & 0 deletions tests/cases/compiler/isolatedModulesExternalModuleForced.ts
@@ -0,0 +1,6 @@
// @isolatedModules: true
// @target: es6
// @moduleDetection: force

// @filename: file1.ts
var x;
11 changes: 11 additions & 0 deletions tests/cases/compiler/isolatedModulesNoExternalModuleMultiple.ts
@@ -0,0 +1,11 @@
// @isolatedModules: true
// @target: es6

// @filename: file1.ts
var x;

// @filename: file2.ts
var y;

// @filename: file3.ts
var z;

0 comments on commit fd3a84c

Please sign in to comment.