maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3121 from Microsoft/consistent-sourceMap-naming

Browse source 
Consistent usage of 'sourceMap' in diagnostics
This commit is contained in:
Daniel Rosenwasser 2015-05-12 11:48:49 -07:00
parent 18c65da36a 99b6e26831
commit 300cb8d9f2
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/diagnosticInformationMap.generated.ts
View file

@ -444,8 +444,8 @@ module ts {
Unknown_compiler_option_0: { code: 5023, category: DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: DiagnosticCategory.Error, key: "Compiler option '{0}' requires a value of type {1}." },
Could_not_write_file_0_Colon_1: { code: 5033, category: DiagnosticCategory.Error, key: "Could not write file '{0}': {1}" },
Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5038, category: DiagnosticCategory.Error, key: "Option 'mapRoot' cannot be specified without specifying 'sourcemap' option." },
Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option: { code: 5039, category: DiagnosticCategory.Error, key: "Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option." },
Option_mapRoot_cannot_be_specified_without_specifying_sourceMap_option: { code: 5038, category: DiagnosticCategory.Error, key: "Option 'mapRoot' cannot be specified without specifying 'sourceMap' option." },
Option_sourceRoot_cannot_be_specified_without_specifying_sourceMap_option: { code: 5039, category: DiagnosticCategory.Error, key: "Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option." },
Option_noEmit_cannot_be_specified_with_option_out_or_outDir: { code: 5040, category: DiagnosticCategory.Error, key: "Option 'noEmit' cannot be specified with option 'out' or 'outDir'." },
Option_noEmit_cannot_be_specified_with_option_declaration: { code: 5041, category: DiagnosticCategory.Error, key: "Option 'noEmit' cannot be specified with option 'declaration'." },
Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: DiagnosticCategory.Error, key: "Option 'project' cannot be mixed with source files on a command line." },

4
src/compiler/diagnosticMessages.json
View file

@ -1765,11 +1765,11 @@
"category": "Error",
"code": 5033
},
"Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.": {
"Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.": {
"category": "Error",
"code": 5038
},
"Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.": {
"Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.": {
"category": "Error",
"code": 5039
},

4
src/compiler/program.ts
View file

@ -574,10 +574,10 @@ module ts {
if (!options.sourceMap && (options.mapRoot || options.sourceRoot)) {
// Error to specify --mapRoot or --sourceRoot without mapSourceFiles
if (options.mapRoot) {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_mapRoot_cannot_be_specified_without_specifying_sourcemap_option));
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_mapRoot_cannot_be_specified_without_specifying_sourceMap_option));
}
if (options.sourceRoot) {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_sourceRoot_cannot_be_specified_without_specifying_sourcemap_option));
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_sourceRoot_cannot_be_specified_without_specifying_sourceMap_option));
}
return;
}

8
tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
View file

@ -1,9 +1,9 @@
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {

8
tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
View file

@ -1,9 +1,9 @@
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {

4
tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
View file

@ -1,7 +1,7 @@
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {

4
tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
View file

@ -1,7 +1,7 @@
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5038: Option 'mapRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {

4
tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
View file

@ -1,7 +1,7 @@
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {

4
tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
View file

@ -1,7 +1,7 @@
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourcemap' option.
!!! error TS5039: Option 'sourceRoot' cannot be specified without specifying 'sourceMap' option.
==== m1.ts (0 errors) ====
var m1_a1 = 10;
class m1_c1 {