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

Update baselines

Browse source
This commit is contained in:
Nathan Shively-Sanders 2019-10-18 15:15:12 -07:00
parent 7631501256
commit 7e97680ff1
6 changed files with 51 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
View file

@ -1,5 +1,4 @@
in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
in2.d.ts(1,1): error TS2440: Import declaration conflicts with local declaration of 'A'.
==== decl.d.ts (0 errors) ====
@ -15,13 +14,9 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
class MyClass{ }
}
}
==== in1.d.ts (1 errors) ====
==== in1.d.ts (0 errors) ====
import a = A;
~
!!! error TS2300: Duplicate identifier 'a'.
!!! related TS6203 in2.d.ts:1:8: 'a' was also declared here.
==== in2.d.ts (1 errors) ====
import a = A;
~
!!! error TS2300: Duplicate identifier 'a'.
!!! related TS6203 in1.d.ts:1:8: 'a' was also declared here.
~~~~~~~~~~~~~
!!! error TS2440: Import declaration conflicts with local declaration of 'A'.

13
tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
View file

@ -1,5 +1,4 @@
in1.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
in2.d.ts(1,1): error TS2440: Import declaration conflicts with local declaration of 'A'.
==== decl.d.ts (0 errors) ====
@ -15,13 +14,9 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'.
class MyClass{ }
}
}
==== in1.d.ts (1 errors) ====
==== in1.d.ts (0 errors) ====
import a = A;
~
!!! error TS2300: Duplicate identifier 'a'.
!!! related TS6203 in2.d.ts:1:8: 'a' was also declared here.
==== in2.d.ts (1 errors) ====
import a = A;
~
!!! error TS2300: Duplicate identifier 'a'.
!!! related TS6203 in1.d.ts:1:8: 'a' was also declared here.
~~~~~~~~~~~~~
!!! error TS2440: Import declaration conflicts with local declaration of 'A'.

33
tests/baselines/reference/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.errors.txt Normal file
View file

@ -0,0 +1,33 @@
tests/cases/compiler/global.d.ts(2,11): error TS2451: Cannot redeclare block-scoped variable 'React'.
tests/cases/compiler/module.d.ts(2,21): error TS2451: Cannot redeclare block-scoped variable 'React'.
==== tests/cases/compiler/global.d.ts (1 errors) ====
declare global {
const React: typeof import("./module");
~~~~~
!!! error TS2451: Cannot redeclare block-scoped variable 'React'.
!!! related TS6203 /.src/tests/cases/compiler/module.d.ts:2:21: 'React' was also declared here.
}
export { };
==== tests/cases/compiler/module.d.ts (1 errors) ====
export = React;
export as namespace React;
~~~~~
!!! error TS2451: Cannot redeclare block-scoped variable 'React'.
!!! related TS6203 tests/cases/compiler/global.d.ts:2:11: 'React' was also declared here.
declare namespace React {
function createRef(): any;
}
==== tests/cases/compiler/some_module.ts (0 errors) ====
export { };
React.createRef;
==== tests/cases/compiler/emits.ts (0 errors) ====
console.log("hello");
React.createRef;

3
tests/baselines/reference/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.js
View file

@ -21,7 +21,8 @@ React.createRef;
//// [emits.ts]
console.log("hello");
React.createRef;
React.createRef;
//// [some_module.js]
React.createRef;

8
tests/baselines/reference/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.symbols
View file

@ -3,7 +3,7 @@ declare global {
>global : Symbol(global, Decl(global.d.ts, 0, 0))
const React: typeof import("./module");
>React : Symbol(React, Decl(module.d.ts, 1, 26), Decl(global.d.ts, 1, 9))
>React : Symbol(React, Decl(global.d.ts, 1, 9))
}
export { };
@ -16,7 +16,7 @@ export as namespace React;
>React : Symbol(React, Decl(module.d.ts, 0, 15))
declare namespace React {
>React : Symbol(React, Decl(module.d.ts, 1, 26), Decl(global.d.ts, 1, 9))
>React : Symbol(React, Decl(module.d.ts, 1, 26))
function createRef(): any;
>createRef : Symbol(createRef, Decl(module.d.ts, 3, 25))
@ -26,7 +26,7 @@ declare namespace React {
export { };
React.createRef;
>React.createRef : Symbol(React.createRef, Decl(module.d.ts, 3, 25))
>React : Symbol(React, Decl(module.d.ts, 1, 26), Decl(global.d.ts, 1, 9))
>React : Symbol(React, Decl(module.d.ts, 0, 15))
>createRef : Symbol(React.createRef, Decl(module.d.ts, 3, 25))
=== tests/cases/compiler/emits.ts ===
@ -37,6 +37,6 @@ console.log("hello");
React.createRef;
>React.createRef : Symbol(React.createRef, Decl(module.d.ts, 3, 25))
>React : Symbol(React, Decl(module.d.ts, 1, 26), Decl(global.d.ts, 1, 9))
>React : Symbol(React, Decl(module.d.ts, 0, 15))
>createRef : Symbol(React.createRef, Decl(module.d.ts, 3, 25))

8
tests/baselines/reference/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
View file

@ -3,17 +3,17 @@ declare global {
>global : typeof global
const React: typeof import("./module");
>React : typeof React
>React : typeof import("tests/cases/compiler/module")
}
export { };
=== tests/cases/compiler/module.d.ts ===
export = React;
>React : typeof import("tests/cases/compiler/module")
>React : typeof React
export as namespace React;
>React : typeof import("tests/cases/compiler/module")
>React : typeof React
declare namespace React {
>React : typeof React
@ -26,7 +26,7 @@ declare namespace React {
export { };
React.createRef;
>React.createRef : () => any
>React : typeof React
>React : typeof import("tests/cases/compiler/module")
>createRef : () => any
=== tests/cases/compiler/emits.ts ===