Skip to content

Commit 296e8e0

Browse files
author
Yui T
committed
Update Baselines
1 parent fe80647 commit 296e8e0

File tree

91 files changed

+498
-549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+498
-549
lines changed

‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(5,12): error TS2300: Duplicate identifier 'fn'.
2-
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(10,5): error TS2300: Duplicate identifier 'fn'.
2+
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts(10,21): error TS2300: Duplicate identifier 'fn'.
33

44

55
==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts (2 errors) ====
@@ -15,12 +15,10 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
1515
module clodule {
1616
// error: duplicate identifier expected
1717
export function fn<T>(x: T, y: T): T {
18-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18+
~~
19+
!!! error TS2300: Duplicate identifier 'fn'.
1920
return x;
20-
~~~~~~~~~~~~~~~~~
2121
}
22-
~~~~~
23-
!!! error TS2300: Duplicate identifier 'fn'.
2422
}
2523

2624

‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(5,12): error TS2300: Duplicate identifier 'fn'.
2-
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(10,5): error TS2300: Duplicate identifier 'fn'.
2+
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts(10,21): error TS2300: Duplicate identifier 'fn'.
33

44

55
==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts (2 errors) ====
@@ -15,12 +15,10 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
1515
module clodule {
1616
// error: duplicate identifier expected
1717
export function fn<T>(x: T, y: T): T {
18-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18+
~~
19+
!!! error TS2300: Duplicate identifier 'fn'.
1920
return x;
20-
~~~~~~~~~~~~~~~~~
2121
}
22-
~~~~~
23-
!!! error TS2300: Duplicate identifier 'fn'.
2422
}
2523

2624

‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(4,12): error TS2300: Duplicate identifier 'Origin'.
2-
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(8,5): error TS2300: Duplicate identifier 'Origin'.
2+
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(8,21): error TS2300: Duplicate identifier 'Origin'.
33
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(16,16): error TS2300: Duplicate identifier 'Origin'.
4-
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20,9): error TS2300: Duplicate identifier 'Origin'.
4+
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20,25): error TS2300: Duplicate identifier 'Origin'.
55

66

77
==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts (4 errors) ====
@@ -15,7 +15,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
1515

1616
module Point {
1717
export function Origin() { return null; } //expected duplicate identifier error
18-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18+
~~~~~~
1919
!!! error TS2300: Duplicate identifier 'Origin'.
2020
}
2121

@@ -31,7 +31,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
3131

3232
export module Point {
3333
export function Origin() { return ""; }//expected duplicate identifier error
34-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
34+
~~~~~~
3535
!!! error TS2300: Duplicate identifier 'Origin'.
3636
}
3737
}

‎tests/baselines/reference/ambientClassOverloadForFunction.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tests/cases/compiler/ambientClassOverloadForFunction.ts(1,15): error TS2300: Duplicate identifier 'foo'.
2-
tests/cases/compiler/ambientClassOverloadForFunction.ts(2,1): error TS2300: Duplicate identifier 'foo'.
2+
tests/cases/compiler/ambientClassOverloadForFunction.ts(2,10): error TS2300: Duplicate identifier 'foo'.
33

44

55
==== tests/cases/compiler/ambientClassOverloadForFunction.ts (2 errors) ====
66
declare class foo{};
77
~~~
88
!!! error TS2300: Duplicate identifier 'foo'.
99
function foo() { return null; }
10-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10+
~~~
1111
!!! error TS2300: Duplicate identifier 'foo'.
1212

‎tests/baselines/reference/anyDeclare.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/compiler/anyDeclare.ts(3,9): error TS2300: Duplicate identifier 'myFn'.
2-
tests/cases/compiler/anyDeclare.ts(4,5): error TS2300: Duplicate identifier 'myFn'.
2+
tests/cases/compiler/anyDeclare.ts(4,14): error TS2300: Duplicate identifier 'myFn'.
33

44

55
==== tests/cases/compiler/anyDeclare.ts (2 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/anyDeclare.ts(4,5): error TS2300: Duplicate identifier 'myF
99
~~~~
1010
!!! error TS2300: Duplicate identifier 'myFn'.
1111
function myFn() { }
12-
~~~~~~~~~~~~~~~~~~~~
12+
~~~~
1313
!!! error TS2300: Duplicate identifier 'myFn'.
1414
}
1515

‎tests/baselines/reference/augmentedTypesClass2a.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
2-
tests/cases/compiler/augmentedTypesClass2a.ts(3,1): error TS2300: Duplicate identifier 'c2'.
2+
tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
33
tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate identifier 'c2'.
44

55

@@ -9,7 +9,7 @@ tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate iden
99
~~
1010
!!! error TS2300: Duplicate identifier 'c2'.
1111
function c2() { } // error
12-
~~~~~~~~~~~~~~~~~
12+
~~
1313
!!! error TS2300: Duplicate identifier 'c2'.
1414
var c2 = () => { }
1515
~~

‎tests/baselines/reference/augmentedTypesEnum.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/compiler/augmentedTypesEnum.ts(2,6): error TS2300: Duplicate identifier 'e1111'.
22
tests/cases/compiler/augmentedTypesEnum.ts(3,5): error TS2300: Duplicate identifier 'e1111'.
33
tests/cases/compiler/augmentedTypesEnum.ts(6,6): error TS2300: Duplicate identifier 'e2'.
4-
tests/cases/compiler/augmentedTypesEnum.ts(7,1): error TS2300: Duplicate identifier 'e2'.
4+
tests/cases/compiler/augmentedTypesEnum.ts(7,10): error TS2300: Duplicate identifier 'e2'.
55
tests/cases/compiler/augmentedTypesEnum.ts(9,6): error TS2300: Duplicate identifier 'e3'.
66
tests/cases/compiler/augmentedTypesEnum.ts(10,5): error TS2300: Duplicate identifier 'e3'.
77
tests/cases/compiler/augmentedTypesEnum.ts(13,6): error TS2300: Duplicate identifier 'e4'.
@@ -26,7 +26,7 @@ tests/cases/compiler/augmentedTypesEnum.ts(21,12): error TS2432: In an enum with
2626
~~
2727
!!! error TS2300: Duplicate identifier 'e2'.
2828
function e2() { } // error
29-
~~~~~~~~~~~~~~~~~
29+
~~
3030
!!! error TS2300: Duplicate identifier 'e2'.
3131

3232
enum e3 { One } // error

‎tests/baselines/reference/augmentedTypesFunction.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/compiler/augmentedTypesFunction.ts(2,10): error TS2300: Duplicate identifier 'y1'.
22
tests/cases/compiler/augmentedTypesFunction.ts(3,5): error TS2300: Duplicate identifier 'y1'.
3-
tests/cases/compiler/augmentedTypesFunction.ts(6,1): error TS2393: Duplicate function implementation.
4-
tests/cases/compiler/augmentedTypesFunction.ts(7,1): error TS2393: Duplicate function implementation.
3+
tests/cases/compiler/augmentedTypesFunction.ts(6,10): error TS2393: Duplicate function implementation.
4+
tests/cases/compiler/augmentedTypesFunction.ts(7,10): error TS2393: Duplicate function implementation.
55
tests/cases/compiler/augmentedTypesFunction.ts(9,10): error TS2300: Duplicate identifier 'y2a'.
66
tests/cases/compiler/augmentedTypesFunction.ts(10,5): error TS2300: Duplicate identifier 'y2a'.
77
tests/cases/compiler/augmentedTypesFunction.ts(13,10): error TS2300: Duplicate identifier 'y3'.
@@ -23,10 +23,10 @@ tests/cases/compiler/augmentedTypesFunction.ts(21,6): error TS2300: Duplicate id
2323

2424
// function then function
2525
function y2() { } // error
26-
~~~~~~~~~~~~~~~~~
26+
~~
2727
!!! error TS2393: Duplicate function implementation.
2828
function y2() { } // error
29-
~~~~~~~~~~~~~~~~~
29+
~~
3030
!!! error TS2393: Duplicate function implementation.
3131

3232
function y2a() { } // error

‎tests/baselines/reference/augmentedTypesVar.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/compiler/augmentedTypesVar.ts(6,5): error TS2300: Duplicate identifier 'x2'.
2-
tests/cases/compiler/augmentedTypesVar.ts(7,1): error TS2300: Duplicate identifier 'x2'.
2+
tests/cases/compiler/augmentedTypesVar.ts(7,10): error TS2300: Duplicate identifier 'x2'.
33
tests/cases/compiler/augmentedTypesVar.ts(10,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x3' must be of type 'number', but here has type '() => void'.
44
tests/cases/compiler/augmentedTypesVar.ts(13,5): error TS2300: Duplicate identifier 'x4'.
55
tests/cases/compiler/augmentedTypesVar.ts(14,7): error TS2300: Duplicate identifier 'x4'.
@@ -23,7 +23,7 @@ tests/cases/compiler/augmentedTypesVar.ts(31,8): error TS2300: Duplicate identif
2323
~~
2424
!!! error TS2300: Duplicate identifier 'x2'.
2525
function x2() { } // error
26-
~~~~~~~~~~~~~~~~~
26+
~~
2727
!!! error TS2300: Duplicate identifier 'x2'.
2828

2929
var x3 = 1;

‎tests/baselines/reference/callOverloads1.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/compiler/callOverloads1.ts(1,7): error TS2300: Duplicate identifier 'Foo'.
2-
tests/cases/compiler/callOverloads1.ts(9,1): error TS2300: Duplicate identifier 'Foo'.
2+
tests/cases/compiler/callOverloads1.ts(9,10): error TS2300: Duplicate identifier 'Foo'.
33
tests/cases/compiler/callOverloads1.ts(9,10): error TS2391: Function implementation is missing or not immediately following the declaration.
44
tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
55

@@ -16,7 +16,7 @@ tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeo
1616
}
1717

1818
function Foo(); // error
19-
~~~~~~~~~~~~~~~
19+
~~~
2020
!!! error TS2300: Duplicate identifier 'Foo'.
2121
~~~
2222
!!! error TS2391: Function implementation is missing or not immediately following the declaration.

0 commit comments

Comments
 (0)