Skip to content

Commit d73dd06

Browse files
mhegazymhegazy
committed
Respond to code review comments
1 parent 08fed17 commit d73dd06

7 files changed

Lines changed: 14 additions & 14 deletions

‎src/compiler/diagnosticMessages.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
"category": "Error",
448448
"code": 1147
449449
},
450-
"Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.": {
450+
"Cannot use imports, exports or module augmentations when '--module' is 'none'.": {
451451
"category": "Error",
452452
"code": 1148
453453
},
@@ -2752,7 +2752,7 @@
27522752
"category": "Message",
27532753
"code": 6130
27542754
},
2755-
"Cannot compile modules using option '{0}' unless the '--module' flag is provided with a valid module type.": {
2755+
"Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'.": {
27562756
"category": "Error",
27572757
"code": 6131
27582758
},

‎src/compiler/program.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,7 @@ namespace ts {
20802080
else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) {
20812081
// We cannot use createDiagnosticFromNode because nodes do not have parents yet
20822082
const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
2083-
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_import_export_or_module_augmentation_when_compiling_with_module_is_none));
2083+
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
20842084
}
20852085

20862086
// Cannot specify module gen target of es6 when below es6
@@ -2095,7 +2095,7 @@ namespace ts {
20952095
}
20962096
else if (options.module === undefined && firstExternalModuleSourceFile) {
20972097
const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
2098-
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_provided_with_a_valid_module_type, options.out ? "out" : "outFile"));
2098+
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
20992099
}
21002100
}
21012101

‎tests/baselines/reference/isolatedModulesOut.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
2-
tests/cases/compiler/file1.ts(2,1): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
2+
tests/cases/compiler/file1.ts(2,1): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
33
tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
44

55

@@ -8,7 +8,7 @@ tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when
88

99
export var x;
1010
~~~~~~~~~~~~~
11-
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
11+
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
1212
==== tests/cases/compiler/file2.ts (1 errors) ====
1313
var y;
1414
~~~

‎tests/baselines/reference/moduleNoneErrors.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/compiler/a.ts(1,14): error TS1148: Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.
1+
tests/cases/compiler/a.ts(1,14): error TS1148: Cannot use imports, exports or module augmentations when '--module' is 'none'.
22

33

44
==== tests/cases/compiler/a.ts (1 errors) ====
55
export class Foo {
66
~~~
7-
!!! error TS1148: Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.
7+
!!! error TS1148: Cannot use imports, exports or module augmentations when '--module' is 'none'.
88
foo: string;
99
}
1010

‎tests/baselines/reference/outModuleConcatUnspecifiedModuleKind.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/compiler/a.ts(2,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is provided with a valid module type.
1+
tests/cases/compiler/a.ts(2,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
22

33

44
==== tests/cases/compiler/a.ts (1 errors) ====
55

66
export class A { } // module
77
~
8-
!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is provided with a valid module type.
8+
!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
99

1010
==== tests/cases/compiler/b.ts (0 errors) ====
1111
var x = 0; // global

‎tests/baselines/reference/typeReferenceDirectives11.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/mod1.ts(2,17): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
1+
/mod1.ts(2,17): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
22

33

44
==== /mod2.ts (0 errors) ====
@@ -14,5 +14,5 @@
1414

1515
export function foo(): Lib { return {x: 1} }
1616
~~~
17-
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
17+
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
1818

‎tests/baselines/reference/typeReferenceDirectives12.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/main.ts(1,14): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
1+
/main.ts(1,14): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
22

33

44
==== /mod2.ts (0 errors) ====
@@ -16,7 +16,7 @@
1616
==== /main.ts (1 errors) ====
1717
export class Cls {
1818
~~~
19-
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
19+
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
2020
x
2121
}
2222

0 commit comments

Comments
 (0)