Skip to content

Commit ed5eeaf

Browse files
weswighamweswigham
authored
Preserve range on copied identifiers (#57965)
1 parent c87b5bc commit ed5eeaf

File tree

2,554 files changed

+15038
-15038
lines changed

Some content is hidden

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

2,554 files changed

+15038
-15038
lines changed

‎src/compiler/checker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8611,7 +8611,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
86118611
const type = getDeclaredTypeOfSymbol(sym);
86128612
const name = sym.flags & SymbolFlags.TypeParameter ? typeParameterToName(type, context) : factory.cloneNode(node);
86138613
name.symbol = sym; // for quickinfo, which uses identifier symbol information
8614-
return { introducesError, node: setEmitFlags(setOriginalNode(name, node), EmitFlags.NoAsciiEscaping) };
8614+
return { introducesError, node: setTextRange(setEmitFlags(setOriginalNode(name, node), EmitFlags.NoAsciiEscaping), node) };
86158615
}
86168616
}
86178617

‎tests/baselines/reference/1.0lib-noErrors.types

Lines changed: 60 additions & 60 deletions
Large diffs are not rendered by default.

‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class clodule<T> {
1515

1616
static fn<U>(id: U) { }
1717
>fn : <U>(id: U) => void
18-
> : ^^^^^^^^^^^^^^^^^^
18+
> : ^ ^^^^^^ ^^^^^^^^^
1919
>id : U
2020
> : ^
2121
}
@@ -27,7 +27,7 @@ module clodule {
2727
// error: duplicate identifier expected
2828
export function fn<T>(x: T, y: T): T {
2929
>fn : <T>(x: T, y: T) => T
30-
> : ^^^^^^^^^^^^^^^^^^^^
30+
> : ^ ^^^^^ ^^^^^ ^^^^^
3131
>x : T
3232
> : ^
3333
>y : T

‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module clodule {
2727
// error: duplicate identifier expected
2828
export function fn<T>(x: T, y: T): T {
2929
>fn : <T>(x: T, y: T) => T
30-
> : ^^^^^^^^^^^^^^^^^^^^
30+
> : ^ ^^^^^ ^^^^^ ^^^^^
3131
>x : T
3232
> : ^
3333
>y : T

‎tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module clodule {
2929
// error: duplicate identifier expected
3030
export function fn<T>(x: T, y: T): number {
3131
>fn : <T>(x: T, y: T) => number
32-
> : ^^^^^^^^^^^^^^^^^^^
32+
> : ^ ^^^^^ ^^^^^ ^^^^^
3333
>x : T
3434
> : ^
3535
>y : T

‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Point {
1313

1414
static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
1515
>Origin : () => Point
16-
> : ^^^^^^^^^^^
16+
> : ^^^^^^
1717
>{ x: 0, y: 0 } : { x: number; y: number; }
1818
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
1919
>x : number
@@ -52,7 +52,7 @@ module A {
5252

5353
static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
5454
>Origin : () => Point
55-
> : ^^^^^^^^^^^
55+
> : ^^^^^^
5656
>{ x: 0, y: 0 } : { x: number; y: number; }
5757
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
5858
>x : number

‎tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Point {
1313

1414
static Origin(): Point { return { x: 0, y: 0 }; }
1515
>Origin : () => Point
16-
> : ^^^^^^^^^^^
16+
> : ^^^^^^
1717
>{ x: 0, y: 0 } : { x: number; y: number; }
1818
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
1919
>x : number
@@ -54,7 +54,7 @@ module A {
5454

5555
static Origin(): Point { return { x: 0, y: 0 }; }
5656
>Origin : () => Point
57-
> : ^^^^^^^^^^^
57+
> : ^^^^^^
5858
>{ x: 0, y: 0 } : { x: number; y: number; }
5959
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
6060
>x : number

‎tests/baselines/reference/ClassDeclaration25.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
interface IList<T> {
55
data(): T;
66
>data : () => T
7-
> : ^^^^^^^
7+
> : ^^^^^^
88

99
next(): string;
1010
>next : () => string
@@ -16,7 +16,7 @@ class List<U> implements IList<U> {
1616

1717
data(): U;
1818
>data : () => U
19-
> : ^^^^^^^
19+
> : ^^^^^^
2020

2121
next(): string;
2222
>next : () => string

‎tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module A {
1616

1717
fromOrigin(p: Point): number;
1818
>fromOrigin : (p: Point) => number
19-
> : ^^^^^^^^^^^^^^
19+
> : ^^^^ ^^^^^
2020
>p : Point
2121
> : ^^^^^
2222
}
@@ -33,7 +33,7 @@ module A {
3333

3434
fromOrigin(p: Point) {
3535
>fromOrigin : (p: Point) => number
36-
> : ^^^^^^^^^^^^^^^^^^^^
36+
> : ^^^^ ^^^^^^^^^^^
3737
>p : Point
3838
> : ^^^^^
3939

‎tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module A {
7373

7474
static fromorigin2d(p: Point): Line<Point>{
7575
>fromorigin2d : (p: Point) => Line<Point>
76-
> : ^^^^^^^^^^^^^^^^^^ ^^^^^
76+
> : ^^^^ ^^^^^
7777
>p : Point
7878
> : ^^^^^
7979

‎tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module A {
3131

3232
export function fromOrigin(p: Point): Line {
3333
>fromOrigin : (p: Point) => Line
34-
> : ^^^^^^^^^^^^^^^^^^
34+
> : ^^^^ ^^^^^
3535
>p : Point
3636
> : ^^^^^
3737

‎tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module A {
3131

3232
export function fromOrigin(p: Point): Line {
3333
>fromOrigin : (p: Point) => Line
34-
> : ^^^^^^^^^^^^^^^^^^
34+
> : ^^^^ ^^^^^
3535
>p : Point
3636
> : ^^^^^
3737

‎tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module A {
3131

3232
export function fromOrigin(p: Point): Line {
3333
>fromOrigin : (p: Point) => Line
34-
> : ^^^^^^^^^^^^^^^^^^
34+
> : ^^^^ ^^^^^
3535
>p : Point
3636
> : ^^^^^
3737

‎tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module A {
4646

4747
static fromOrigin(p: Point) {
4848
>fromOrigin : (p: Point) => Line
49-
> : ^^^^^^^^^^^^^^^^^^
49+
> : ^^^^ ^^^^^^^^^
5050
>p : Point
5151
> : ^^^^^
5252

‎tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ module A {
1818

1919
export var UnitSquare : {
2020
>UnitSquare : { top: { left: Point; right: Point; }; bottom: { left: Point; right: Point; }; }
21-
> : ^^^^^^^ ^^^^^ ^^^^^ ^^^^^^^^^^ ^^^^^ ^^^^^ ^^^
21+
> : ^^^^^^^ ^^^^^^^^^^ ^^^
2222

2323
top: { left: Point, right: Point },
2424
>top : { left: Point; right: Point; }
25-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25+
> : ^^^^^^^^ ^^^^^^^^^ ^^^
2626
>left : Point
2727
> : ^^^^^
2828
>right : Point
2929
> : ^^^^^
3030

3131
bottom: { left: Point, right: Point }
3232
>bottom : { left: Point; right: Point; }
33-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33+
> : ^^^^^^^^ ^^^^^^^^^ ^^^
3434
>left : Point
3535
> : ^^^^^
3636
>right : Point

‎tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module A {
1818

1919
export function fng<T, U>(s: T): U {
2020
>fng : <T, U>(s: T) => U
21-
> : ^^^^^^^^^^^^^^^^^
21+
> : ^ ^^ ^^^^^ ^^^^^
2222
>s : T
2323
> : ^
2424

@@ -38,7 +38,7 @@ module A {
3838

3939
function fng2<T, U>(s: T): U {
4040
>fng2 : <T, U>(s: T) => U
41-
> : ^^^^^^^^^^^^^^^^^
41+
> : ^ ^^ ^^^^^ ^^^^^
4242
>s : T
4343
> : ^
4444

@@ -65,7 +65,7 @@ var fn = A.fn;
6565

6666
var fng: <T, U>(s: T) => U;
6767
>fng : <T, U>(s: T) => U
68-
> : ^^^^^^^^^^^^^^^^^
68+
> : ^ ^^ ^^^^^ ^^^^^
6969
>s : T
7070
> : ^
7171

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module A {
2929

3030
fromCarthesian(p: A.Point) {
3131
>fromCarthesian : (p: A.Point) => { x: number; y: number; }
32-
> : ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32+
> : ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3333
>p : A.Point
3434
> : ^^^^^^^
3535
>A : any

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ module A {
1313

1414
toCarth(): Point;
1515
>toCarth : () => Point
16-
> : ^^^^^^^^^^^
16+
> : ^^^^^^
1717
}
1818
}
1919

2020
module A {
2121
interface Point {
2222
fromCarth(): Point;
2323
>fromCarth : () => Point
24-
> : ^^^^^^^^^^^
24+
> : ^^^^^^
2525
}
2626
}
2727

2828
// ensure merges as expected
2929
var p: { x: number; y: number; toCarth(): A.Point; };
3030
>p : { x: number; y: number; toCarth(): A.Point; }
31-
> : ^^^^^ ^^^^^ ^^^^^^^^^^^^^^ ^^^
31+
> : ^^^^^ ^^^^^ ^^^^^^^^^^^^^ ^^^
3232
>x : number
3333
> : ^^^^^^
3434
>y : number
3535
> : ^^^^^^
3636
>toCarth : () => A.Point
37-
> : ^^^^^^^
37+
> : ^^^^^^
3838
>A : any
3939
> : ^^^
4040

@@ -79,7 +79,7 @@ module X {
7979
// ensure merges as expected
8080
var l: { new (s: A.Point, e: A.Point); }
8181
>l : new (s: A.Point, e: A.Point) => any
82-
> : ^^^^^^^^^ ^^^^^^ ^^^^^^^^
82+
> : ^^^^^^^^ ^^^^^ ^^^^^^^^
8383
>s : A.Point
8484
> : ^^^^^^^
8585
>A : any

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module A {
2121

2222
export function mirror<T extends Point>(p: T) {
2323
>mirror : <T extends Point>(p: T) => { x: number; y: number; }
24-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
> : ^ ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2525
>p : T
2626
> : ^
2727

@@ -137,7 +137,7 @@ var o = A.Utils.mirror(o);
137137

138138
var p: { tl: A.Point; br: A.Point };
139139
>p : { tl: A.Point; br: A.Point; }
140-
> : ^^^^^^^ ^^^^^^^ ^^^
140+
> : ^^^^^^ ^^^^^^ ^^^
141141
>tl : A.Point
142142
> : ^^^^^^^
143143
>A : any

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ module A {
1313

1414
toCarth(): Point;
1515
>toCarth : () => Point
16-
> : ^^^^^^^^^^^
16+
> : ^^^^^^
1717
}
1818
}
1919

2020
module A {
2121
export interface Point {
2222
fromCarth(): Point;
2323
>fromCarth : () => Point
24-
> : ^^^^^^^^^^^
24+
> : ^^^^^^
2525
}
2626
}
2727

2828
// ensure merges as expected
2929
var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; };
3030
>p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
31-
> : ^^^^^ ^^^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^^^
31+
> : ^^^^^ ^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^
3232
>x : number
3333
> : ^^^^^^
3434
>y : number
3535
> : ^^^^^^
3636
>toCarth : () => A.Point
37-
> : ^^^^^^^
37+
> : ^^^^^^
3838
>A : any
3939
> : ^^^
4040
>fromCarth : () => A.Point
41-
> : ^^^^^^^
41+
> : ^^^^^^
4242
>A : any
4343
> : ^^^
4444

@@ -83,7 +83,7 @@ module X {
8383
// ensure merges as expected
8484
var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); }
8585
>l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
86-
> : ^^^^^^^^^^^ ^^^^^^ ^^^^^^^^^^^^^^^^ ^^^^^^^^ ^^^
86+
> : ^^^^^^^^^^ ^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^ ^^^
8787
>start : A.Point
8888
> : ^^^^^^^
8989
>A : any

‎tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export module A {
2121

2222
export function mirror<T extends Point>(p: T) {
2323
>mirror : <T extends Point>(p: T) => { x: number; y: number; }
24-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
> : ^ ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2525
>p : T
2626
> : ^
2727

‎tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module Root {
2525

2626
export function mirror<T extends Point>(p: T) {
2727
>mirror : <T extends Point>(p: T) => { x: number; y: number; }
28-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
28+
> : ^ ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2929
>p : T
3030
> : ^
3131

‎tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module A {
2121

2222
export function mirror<T extends Point>(p: T) {
2323
>mirror : <T extends Point>(p: T) => { x: number; y: number; }
24-
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
> : ^ ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2525
>p : T
2626
> : ^
2727

@@ -131,7 +131,7 @@ var o = A.Utils.mirror(o);
131131

132132
var p: { tl: A.Point; br: A.Point };
133133
>p : { tl: A.Point; br: A.Point; }
134-
> : ^^^^^^^ ^^^^^^^ ^^^
134+
> : ^^^^^^ ^^^^^^ ^^^
135135
>tl : A.Point
136136
> : ^^^^^^^
137137
>A : any

‎tests/baselines/reference/TypeGuardWithArrayUnion.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Message {
1212

1313
function saySize(message: Message | Message[]) {
1414
>saySize : (message: Message | Message[]) => number
15-
> : ^^^^^^^^^^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^
15+
> : ^^^^^^^^^^ ^^^^^^^^^^^
1616
>message : Message | Message[]
1717
> : ^^^^^^^^^^^^^^^^^^^
1818

‎tests/baselines/reference/TypeGuardWithEnumUnion.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ enum Color { R, G, B }
1313

1414
function f1(x: Color | string) {
1515
>f1 : (x: Color | string) => void
16-
> : ^^^^^^^^^ ^^^^^^^^^
16+
> : ^^^^ ^^^^^^^^^
1717
>x : string | Color
1818
> : ^^^^^^^^^^^^^^
1919

@@ -52,7 +52,7 @@ function f1(x: Color | string) {
5252

5353
function f2(x: Color | string | string[]) {
5454
>f2 : (x: Color | string | string[]) => void
55-
> : ^^^^^^^^^ ^^^^^^^^^
55+
> : ^^^^ ^^^^^^^^^
5656
>x : string | Color | string[]
5757
> : ^^^^^^^^^^^^^^^^^^^^^^^^^
5858

‎tests/baselines/reference/accessorAccidentalCallDiagnostic.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Test24554 {
1414
}
1515
function test24554(x: Test24554) {
1616
>test24554 : (x: Test24554) => any
17-
> : ^^^^^^^^^^^^^^^^^^^^^
17+
> : ^^^^ ^^^^^^^^
1818
>x : Test24554
1919
> : ^^^^^^^^^
2020

0 commit comments

Comments
 (0)