Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

update error

Browse Source
This commit is contained in:
Wesley Wigham
2015-10-28 17:00:47 -07:00
parent c4db5cc6b5
commit 0e47c67ee1
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+1 -1
View File
@@ -358,7 +358,7 @@ namespace ts {
}
function addDeclarationDiagnostic(id: string, declaration: Declaration) {
diagnostics.add(createDiagnosticForNode(declaration, Diagnostics.Declaration_duplicates_builtin_global_identifier_0, id));
diagnostics.add(createDiagnosticForNode(declaration, Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, id));
}
}
src/compiler/diagnosticMessages.json
+1 -1
View File
@@ -1168,7 +1168,7 @@
"category": "Error",
"code": 2396
},
"Declaration duplicates builtin global identifier '{0}'.": {
"Declaration name conflicts with built-in global identifier '{0}'.": {
"category": "Error",
"code": 2397
},
tests/baselines/reference/undefinedTypeAssignment.errors.txt
+12 -12
View File
@@ -1,39 +1,39 @@
tests/cases/compiler/a.ts(1,1): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/a.ts(2,5): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/a.ts(3,5): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/b.ts(1,7): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/b.ts(4,11): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/b.ts(7,11): error TS2397: Declaration duplicates builtin global identifier 'undefined'.
tests/cases/compiler/a.ts(1,1): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/a.ts(2,5): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/a.ts(3,5): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/b.ts(1,7): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/b.ts(4,11): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/b.ts(7,11): error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
tests/cases/compiler/b.ts(10,8): error TS2304: Cannot find name 'undefined'.
==== tests/cases/compiler/a.ts (3 errors) ====
type undefined = string;
~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
var undefined = void 0;
~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
var undefined = null;
~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
function p(undefined = 42) {
return undefined;
}
==== tests/cases/compiler/b.ts (4 errors) ====
class undefined {
~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
foo: string;
}
interface undefined {
~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
member: number;
}
namespace undefined {
~~~~~~~~~
!!! error TS2397: Declaration duplicates builtin global identifier 'undefined'.
!!! error TS2397: Declaration name conflicts with built-in global identifier 'undefined'.
export var x = 42;
}
var x: undefined;