Skip to content

Fix error message for UMD globals #11570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielRosenwasser merged 2 commits into from
Oct 12, 2016
Merged

Fix error message for UMD globals #11570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bbaef6
Change error message for referencing UMD globals from a module.
DanielRosenwasser Oct 12, 2016
fbb9d5b
Accepted baselines.
DanielRosenwasser Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/diagnosticMessages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/umd5.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) ====
Expand All @@ -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) ====

Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/umd8.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) ====
Expand All @@ -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) ====

Expand Down