microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 04:43:37 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #11570 from Microsoft/fixErrorMessageForUmdGlobals

Browse Source 
Fix error message for UMD globals
This commit is contained in:
Daniel Rosenwasser
2016-10-12 15:30:54 -07:00
committed by GitHub
parent 1b32744925 fbb9d5b148
commit 31a55e6452
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -922,7 +922,7 @@ namespace ts {
if (result && isInExternalModule && (meaning & SymbolFlags.Value) === SymbolFlags.Value) {
const decls = result.declarations;
if (decls && decls.length === 1 && decls[0].kind === SyntaxKind.NamespaceExportDeclaration) {
error(errorLocation, Diagnostics.Identifier_0_must_be_imported_from_a_module, name);
error(errorLocation, Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
}
}
}

2
src/compiler/diagnosticMessages.json
View File

@@ -1923,7 +1923,7 @@
"category": "Error",
"code": 2685
},
"Identifier '{0}' must be imported from a module": {
"'{0}' refers to a UMD global, but the current file is a module. Consider adding an import instead.": {
"category": "Error",
"code": 2686
},

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

@@ -1,4 +1,4 @@
tests/cases/conformance/externalModules/a.ts(6,9): error TS2686: Identifier 'Foo' must be imported from a module
tests/cases/conformance/externalModules/a.ts(6,9): error TS2686: 'Foo' refers to a UMD global, but the current file is a module. Consider adding an import instead.
==== tests/cases/conformance/externalModules/a.ts (1 errors) ====
@@ -9,7 +9,7 @@ tests/cases/conformance/externalModules/a.ts(6,9): error TS2686: Identifier 'Foo
// should error
let z = Foo;
~~~
!!! error TS2686: Identifier 'Foo' must be imported from a module
!!! error TS2686: 'Foo' refers to a UMD global, but the current file is a module. Consider adding an import instead.
==== tests/cases/conformance/externalModules/foo.d.ts (0 errors) ====

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

@@ -1,4 +1,4 @@
tests/cases/conformance/externalModules/a.ts(7,14): error TS2686: Identifier 'Foo' must be imported from a module
tests/cases/conformance/externalModules/a.ts(7,14): error TS2686: 'Foo' refers to a UMD global, but the current file is a module. Consider adding an import instead.
==== tests/cases/conformance/externalModules/a.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/externalModules/a.ts(7,14): error TS2686: Identifier 'Fo
let z: Foo.SubThing; // OK in ns position
let x: any = Foo; // Not OK in value position
~~~
!!! error TS2686: Identifier 'Foo' must be imported from a module
!!! error TS2686: 'Foo' refers to a UMD global, but the current file is a module. Consider adding an import instead.
==== tests/cases/conformance/externalModules/foo.d.ts (0 errors) ====