microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-10 17:05:58 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update error message

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-05-17 17:15:06 -07:00
parent 53f6755907
commit 02f0065c95
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/diagnosticMessages.json
View File

@@ -447,7 +447,7 @@
"category": "Error",
"code": 1147
},
"Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": {
"Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.": {
"category": "Error",
"code": 1148
},

2
src/compiler/program.ts
View File

@@ -2080,7 +2080,7 @@ namespace ts {
else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) {
// We cannot use createDiagnosticFromNode because nodes do not have parents yet
const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_import_export_or_module_augmentation_when_compiling_with_module_is_none));
}
// Cannot specify module gen target of es6 when below es6

5
tests/baselines/reference/isolatedModulesOut.errors.txt
View File

@@ -1,11 +1,14 @@
error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
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.
tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
!!! error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
==== tests/cases/compiler/file1.ts (0 errors) ====
==== tests/cases/compiler/file1.ts (1 errors) ====
export var x;
~~~~~~~~~~~~~
!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is provided with a valid module type.
==== tests/cases/compiler/file2.ts (1 errors) ====
var y;
~~~

4
tests/baselines/reference/moduleNoneErrors.errors.txt
View File

@@ -1,10 +1,10 @@
tests/cases/compiler/a.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
tests/cases/compiler/a.ts(1,14): error TS1148: Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.
==== tests/cases/compiler/a.ts (1 errors) ====
export class Foo {
~~~
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
!!! error TS1148: Cannot use 'import', 'export' or module augmentation when compiling with '--module' is 'none'.
foo: string;
}