Skip to content

Commit dfe8cab

Browse files
author
Andy
authored
Reduce size of span for unused declaration (revert #22388) (#24566) (#24573)
1 parent 3f77e1e commit dfe8cab

32 files changed

+97
-102
lines changed

‎src/compiler/checker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22692,7 +22692,7 @@ namespace ts {
2269222692
function errorUnusedLocal(declaration: Declaration, name: string, addDiagnostic: AddUnusedDiagnostic) {
2269322693
const node = getNameOfDeclaration(declaration) || declaration;
2269422694
const message = isTypeDeclaration(declaration) ? Diagnostics._0_is_declared_but_never_used : Diagnostics._0_is_declared_but_its_value_is_never_read;
22695-
addDiagnostic(UnusedKind.Local, createDiagnosticForNodeSpan(getSourceFileOfNode(declaration), declaration, node, message, name));
22695+
addDiagnostic(UnusedKind.Local, createDiagnosticForNode(node, message, name));
2269622696
}
2269722697

2269822698
function parameterNameStartsWithUnderscore(parameterName: DeclarationName) {

‎src/compiler/utilities.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -637,11 +637,6 @@ namespace ts {
637637
return createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2, arg3);
638638
}
639639

640-
export function createDiagnosticForNodeSpan(sourceFile: SourceFile, startNode: Node, endNode: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number, arg3?: string | number): DiagnosticWithLocation {
641-
const start = skipTrivia(sourceFile.text, startNode.pos);
642-
return createFileDiagnostic(sourceFile, start, endNode.end - start, message, arg0, arg1, arg2, arg3);
643-
}
644-
645640
export function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): DiagnosticWithLocation {
646641
const sourceFile = getSourceFileOfNode(node);
647642
const span = getErrorSpanForNode(sourceFile, node);

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
tests/cases/compiler/noUnusedLocals_selfReference.ts(3,1): error TS6133: 'f' is declared but its value is never read.
2-
tests/cases/compiler/noUnusedLocals_selfReference.ts(5,5): error TS6133: 'g' is declared but its value is never read.
3-
tests/cases/compiler/noUnusedLocals_selfReference.ts(9,1): error TS6196: 'C' is declared but never used.
4-
tests/cases/compiler/noUnusedLocals_selfReference.ts(12,1): error TS6196: 'E' is declared but never used.
5-
tests/cases/compiler/noUnusedLocals_selfReference.ts(13,1): error TS6196: 'I' is declared but never used.
6-
tests/cases/compiler/noUnusedLocals_selfReference.ts(14,1): error TS6196: 'T' is declared but never used.
7-
tests/cases/compiler/noUnusedLocals_selfReference.ts(15,1): error TS6133: 'N' is declared but its value is never read.
1+
tests/cases/compiler/noUnusedLocals_selfReference.ts(3,10): error TS6133: 'f' is declared but its value is never read.
2+
tests/cases/compiler/noUnusedLocals_selfReference.ts(5,14): error TS6133: 'g' is declared but its value is never read.
3+
tests/cases/compiler/noUnusedLocals_selfReference.ts(9,7): error TS6196: 'C' is declared but never used.
4+
tests/cases/compiler/noUnusedLocals_selfReference.ts(12,6): error TS6196: 'E' is declared but never used.
5+
tests/cases/compiler/noUnusedLocals_selfReference.ts(13,11): error TS6196: 'I' is declared but never used.
6+
tests/cases/compiler/noUnusedLocals_selfReference.ts(14,6): error TS6196: 'T' is declared but never used.
7+
tests/cases/compiler/noUnusedLocals_selfReference.ts(15,11): error TS6133: 'N' is declared but its value is never read.
88
tests/cases/compiler/noUnusedLocals_selfReference.ts(22,19): error TS6133: 'm' is declared but its value is never read.
99

1010

1111
==== tests/cases/compiler/noUnusedLocals_selfReference.ts (8 errors) ====
1212
export {}; // Make this a module scope, so these are local variables.
1313

1414
function f() {
15-
~~~~~~~~~~
15+
~
1616
!!! error TS6133: 'f' is declared but its value is never read.
1717
f;
1818
function g() {
19-
~~~~~~~~~~
19+
~
2020
!!! error TS6133: 'g' is declared but its value is never read.
2121
g;
2222
}
2323
}
2424
class C {
25-
~~~~~~~
25+
~
2626
!!! error TS6196: 'C' is declared but never used.
2727
m() { C; }
2828
}
2929
enum E { A = 0, B = E.A }
30-
~~~~~~
30+
~
3131
!!! error TS6196: 'E' is declared but never used.
3232
interface I { x: I };
33-
~~~~~~~~~~~
33+
~
3434
!!! error TS6196: 'I' is declared but never used.
3535
type T = { x: T };
36-
~~~~~~
36+
~
3737
!!! error TS6196: 'T' is declared but never used.
3838
namespace N { N; }
39-
~~~~~~~~~~~
39+
~
4040
!!! error TS6133: 'N' is declared but its value is never read.
4141

4242
// Avoid a false positive.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(2,5): error TS6133: 'f' is declared but its value is never read.
2-
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(8,13): error TS6133: 'g' is declared but its value is never read.
3-
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(12,13): error TS6133: 'h' is declared but its value is never read.
1+
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(2,14): error TS6133: 'f' is declared but its value is never read.
2+
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(8,22): error TS6133: 'g' is declared but its value is never read.
3+
tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts(12,22): error TS6133: 'h' is declared but its value is never read.
44

55

66
==== tests/cases/compiler/noUnusedLocals_selfReference_skipsBlockLocations.ts (3 errors) ====
77
namespace n {
88
function f() {
9-
~~~~~~~~~~
9+
~
1010
!!! error TS6133: 'f' is declared but its value is never read.
1111
f;
1212
}
1313

1414
switch (0) {
1515
case 0:
1616
function g() {
17-
~~~~~~~~~~
17+
~
1818
!!! error TS6133: 'g' is declared but its value is never read.
1919
g;
2020
}
2121
default:
2222
function h() {
23-
~~~~~~~~~~
23+
~
2424
!!! error TS6133: 'h' is declared but its value is never read.
2525
h;
2626
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/compiler/unusedClassesinModule1.ts(2,5): error TS6196: 'Calculator' is declared but never used.
1+
tests/cases/compiler/unusedClassesinModule1.ts(2,11): error TS6196: 'Calculator' is declared but never used.
22

33

44
==== tests/cases/compiler/unusedClassesinModule1.ts (1 errors) ====
55
module A {
66
class Calculator {
7-
~~~~~~~~~~~~~~~~
7+
~~~~~~~~~~
88
!!! error TS6196: 'Calculator' is declared but never used.
99
public handelChar() {
1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/compiler/unusedClassesinNamespace1.ts(2,5): error TS6196: 'c1' is declared but never used.
1+
tests/cases/compiler/unusedClassesinNamespace1.ts(2,11): error TS6196: 'c1' is declared but never used.
22

33

44
==== tests/cases/compiler/unusedClassesinNamespace1.ts (1 errors) ====
55
namespace Validation {
66
class c1 {
7-
~~~~~~~~
7+
~~
88
!!! error TS6196: 'c1' is declared but never used.
99

1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/compiler/unusedClassesinNamespace2.ts(2,5): error TS6196: 'c1' is declared but never used.
1+
tests/cases/compiler/unusedClassesinNamespace2.ts(2,11): error TS6196: 'c1' is declared but never used.
22

33

44
==== tests/cases/compiler/unusedClassesinNamespace2.ts (1 errors) ====
55
namespace Validation {
66
class c1 {
7-
~~~~~~~~
7+
~~
88
!!! error TS6196: 'c1' is declared but never used.
99

1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/unusedClassesinNamespace4.ts(10,5): error TS6196: 'c3' is declared but never used.
1+
tests/cases/compiler/unusedClassesinNamespace4.ts(10,11): error TS6196: 'c3' is declared but never used.
22

33

44
==== tests/cases/compiler/unusedClassesinNamespace4.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/unusedClassesinNamespace4.ts(10,5): error TS6196: 'c3' is d
1212
}
1313

1414
class c3 extends c1 {
15-
~~~~~~~~
15+
~~
1616
!!! error TS6196: 'c3' is declared but never used.
1717

1818
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/unusedClassesinNamespace5.ts(10,5): error TS6196: 'c3' is declared but never used.
1+
tests/cases/compiler/unusedClassesinNamespace5.ts(10,11): error TS6196: 'c3' is declared but never used.
22

33

44
==== tests/cases/compiler/unusedClassesinNamespace5.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/unusedClassesinNamespace5.ts(10,5): error TS6196: 'c3' is d
1212
}
1313

1414
class c3 {
15-
~~~~~~~~
15+
~~
1616
!!! error TS6196: 'c3' is declared but never used.
1717
public x: c1;
1818
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tests/cases/compiler/unusedDestructuring.ts(4,9): error TS6133: 'c' is declared
33
tests/cases/compiler/unusedDestructuring.ts(6,7): error TS6133: 'e' is declared but its value is never read.
44
tests/cases/compiler/unusedDestructuring.ts(7,7): error TS6133: 'g' is declared but its value is never read.
55
tests/cases/compiler/unusedDestructuring.ts(8,1): error TS6199: All variables are unused.
6-
tests/cases/compiler/unusedDestructuring.ts(10,1): error TS6133: 'f' is declared but its value is never read.
6+
tests/cases/compiler/unusedDestructuring.ts(10,10): error TS6133: 'f' is declared but its value is never read.
77
tests/cases/compiler/unusedDestructuring.ts(10,12): error TS6198: All destructured elements are unused.
88
tests/cases/compiler/unusedDestructuring.ts(10,24): error TS6133: 'c' is declared but its value is never read.
99
tests/cases/compiler/unusedDestructuring.ts(10,32): error TS6133: 'e' is declared but its value is never read.
@@ -30,7 +30,7 @@ tests/cases/compiler/unusedDestructuring.ts(10,32): error TS6133: 'e' is declare
3030
!!! error TS6199: All variables are unused.
3131

3232
function f({ a, b }, { c, d }, { e }) {
33-
~~~~~~~~~~
33+
~
3434
!!! error TS6133: 'f' is declared but its value is never read.
3535
~~~~~~~~
3636
!!! error TS6198: All destructured elements are unused.

0 commit comments

Comments
 (0)