implementations: Use declaration name for the span (#24537)

* implementations: Use declaration name for the span

* Always get name in nodeEntry

Author: Andy

src/services/findAllReferences.ts

@@ -24,7 +24,7 @@ namespace ts.FindAllReferences {
         textSpan: TextSpan;
     }
     export function nodeEntry(node: Node, isInString?: true): NodeEntry {
-        return { type: "node", node, isInString };
+        return { type: "node", node: (node as NamedDeclaration).name || node, isInString };
     }
 
     export interface Options {
@@ -1096,7 +1096,7 @@ namespace ts.FindAllReferences.Core {
     function addImplementationReferences(refNode: Node, addReference: (node: Node) => void, state: State): void {
         // Check if we found a function/propertyAssignment/method with an implementation or initializer
         if (isDeclarationName(refNode) && isImplementation(refNode.parent)) {
-            addReference(refNode.parent);
+            addReference(refNode);
             return;
         }
 

tests/cases/fourslash/goToImplementationClassMethod_00.ts

@@ -3,7 +3,7 @@
 // Should handle calls made on members declared in a class
 
 //// class Bar {
-////     [|{|"parts": ["(","method",")"," ","Bar",".","hello","(",")",":"," ","void"], "kind": "method"|}hello() {}|]
+////     [|{|"parts": ["(","method",")"," ","Bar",".","hello","(",")",":"," ","void"], "kind": "method"|}hello|]() {}
 //// }
 ////
 //// new Bar().hel/*reference*/lo;

tests/cases/fourslash/goToImplementationClassMethod_01.ts

@@ -7,7 +7,7 @@
 //// }
 ////
 //// class Bar extends AbstractBar{
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// function whatever(x: AbstractBar) {

tests/cases/fourslash/goToImplementationEnum_00.ts

@@ -3,7 +3,7 @@
 // Should handle calls made on members of an enum
 
 //// enum Foo {
-////     [|Foo1 = function initializer() { return 5 } ()|],
+////     [|Foo1|] = function initializer() { return 5 } (),
 ////     Foo2 = 6
 //// }
 ////

tests/cases/fourslash/goToImplementationEnum_01.ts

@@ -2,10 +2,10 @@
 
 // Should handle calls made on enum name
 
-//// [|enum Foo {
+//// enum [|Foo|] {
 ////     Foo1 = function initializer() { return 5 } (),
 ////     Foo2 = 6
-//// }|]
+//// }
 ////
 //// Fo/*reference*/o;
 

tests/cases/fourslash/goToImplementationInterfaceMethod_00.ts

@@ -6,19 +6,19 @@
 ////     he/*declaration*/llo: () => void
 //// }
 ////
-//// var bar: Foo = { [|hello: helloImpl|] };
-//// var baz: Foo = { [|"hello": helloImpl|] };
+//// var bar: Foo = { [|hello|]: helloImpl };
+//// var baz: Foo = { "[|hello|]": helloImpl };
 ////
 //// function helloImpl () {}
 ////
-//// function whatever(x: Foo = { [|hello() {/**1*/}|] }) {
+//// function whatever(x: Foo = { [|hello|]() {/**1*/} }) {
 ////     x.he/*function_call*/llo()
 //// }
 ////
 //// class Bar {
-////     x: Foo = { [|hello() {/*2*/}|] }
+////     x: Foo = { [|hello|]() {/*2*/} }
 ////
-////     constructor(public f: Foo = { [|hello() {/**3*/}|] } ) {}
+////     constructor(public f: Foo = { [|hello|]() {/**3*/} } ) {}
 //// }
 
 verify.allRangesAppearInImplementationList("function_call");

tests/cases/fourslash/goToImplementationInterfaceMethod_01.ts

@@ -8,7 +8,7 @@
 //// }
 ////
 //// class Bar implements Foo {
-////     [|hello() {}|]
+////     [|hello|]() {}
 ////     public sure() {}
 //// }
 ////

tests/cases/fourslash/goToImplementationInterfaceMethod_02.ts

@@ -11,7 +11,7 @@
 //// }
 ////
 //// class Bar extends AbstractBar {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// function whatever(a: AbstractBar) {

tests/cases/fourslash/goToImplementationInterfaceMethod_03.ts

@@ -7,7 +7,7 @@
 //// }
 ////
 //// class Bar extends SuperBar {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// class SuperBar implements Foo {

tests/cases/fourslash/goToImplementationInterfaceMethod_04.ts

@@ -7,11 +7,11 @@
 //// }
 ////
 //// class Bar extends SuperBar {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// class SuperBar implements Foo {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// class OtherBar implements Foo {

tests/cases/fourslash/goToImplementationInterfaceMethod_05.ts

@@ -7,7 +7,7 @@
 //// }
 ////
 //// class SuperBar implements Foo {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// class Bar extends SuperBar {

tests/cases/fourslash/goToImplementationInterfaceMethod_06.ts

@@ -11,19 +11,19 @@
 //// }
 ////
 //// class Bar implements Foo {
-////      [|hello() {}|]
+////      [|hello|]() {}
 ////      someOtherFunction() {}
 //// }
 ////
 //// function createFoo(): Foo {
 ////     return {
-////         [|hello() {}|],
+////         [|hello|]() {},
 ////         someOtherFunction() {}
 ////     };
 //// }
 ////
 //// var y: Foo = {
-////     [|hello() {}|],
+////     [|hello|]() {},
 ////     someOtherFunction() {}
 //// };
 ////

tests/cases/fourslash/goToImplementationInterfaceMethod_08.ts

@@ -7,15 +7,15 @@
 //// }
 ////
 //// class SuperBar implements Foo {
-////    [|hello() {}|]
+////    [|hello|]() {}
 //// }
 ////
 //// class Bar extends SuperBar {
 ////    whatever() { this.he/*function_call*/llo(); }
 //// }
 ////
 //// class SubBar extends Bar {
-////    [|hello() {}|]
+////    [|hello|]() {}
 //// }
 
 

tests/cases/fourslash/goToImplementationInterfaceMethod_09.ts

@@ -20,7 +20,7 @@
 //// }
 ////
 //// class SuperBar extends MegaBar {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// class MegaBar implements Foo {

tests/cases/fourslash/goToImplementationInterfaceMethod_10.ts

@@ -16,7 +16,7 @@
 //// }
 ////
 //// class FooImpl implements Foo {
-////  	 [|hello() {/**FooImpl*/}|]
+////  	 [|hello|]() {/**FooImpl*/}
 ////  	 aloha() {}
 //// }
 ////
@@ -25,12 +25,12 @@
 //// }
 ////
 //// class BarImpl implements Bar {
-//// 	 [|hello() {/**BarImpl*/}|]
+//// 	 [|hello|]() {/**BarImpl*/}
 //// 	 goodbye() {}
 //// }
 ////
 //// class FooAndBarImpl implements Foo, Bar {
-//// 	 [|hello() {/**FooAndBarImpl*/}|]
+//// 	 [|hello|]() {/**FooAndBarImpl*/}
 //// 	 aloha() {}
 //// 	 goodbye() {}
 //// }

tests/cases/fourslash/goToImplementationInterfaceMethod_11.ts

@@ -6,7 +6,7 @@
 ////    hel/*reference*/lo(): void;
 //// }
 ////
-//// var x = <Foo> { [|hello: () => {}|] };
-//// var y = <Foo> (((({ [|hello: () => {}|] }))));
+//// var x = <Foo> { [|hello|]: () => {} };
+//// var y = <Foo> (((({ [|hello|]: () => {} }))));
 
 verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationInterfaceProperty_00.ts

@@ -6,17 +6,17 @@
 ////     hello: number
 //// }
 ////
-//// var bar: Foo = { [|hello: 5|] };
+//// var bar: Foo = { [|hello|]: 5 };
 ////
 ////
-//// function whatever(x: Foo = { [|hello: 5 * 9|] }) {
+//// function whatever(x: Foo = { [|hello|]: 5 * 9 }) {
 ////     x.he/*reference*/llo
 //// }
 ////
 //// class Bar {
-////     x: Foo = { [|hello: 6|] }
+////     x: Foo = { [|hello|]: 6 }
 ////
-////     constructor(public f: Foo = { [|hello: 7|] } ) {}
+////     constructor(public f: Foo = { [|hello|]: 7 } ) {}
 //// }
 
 verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationInterfaceProperty_01.ts

@@ -5,7 +5,7 @@
 //// interface Foo { hello: number }
 ////
 //// class Bar implements Foo {
-////     [|hello = 5 * 9;|]
+////     [|hello|] = 5 * 9;
 //// }
 ////
 //// function whatever(foo: Foo) {

tests/cases/fourslash/goToImplementationInterface_01.ts

@@ -2,13 +2,13 @@
 
 //// interface Fo/*interface_definition*/o { hello(): void }
 ////
-//// [|class SuperBar implements Foo {
+//// class [|SuperBar|] implements Foo {
 ////     hello () {}
-//// }|]
+//// }
 ////
-//// [|abstract class AbstractBar implements Foo {
+//// abstract class [|AbstractBar|] implements Foo {
 ////     abstract hello (): void;
-//// }|]
+//// }
 ////
 //// class Bar extends SuperBar {
 //// }

tests/cases/fourslash/goToImplementationInterface_07.ts

@@ -20,11 +20,11 @@
 //// let x8: Foo[]          = [|[{ hello ()         { /**arrayType*/} }]|];
 //// let x9: { y: Foo }     = [|{ y: { hello ()     { /**typeLiteral*/} } }|];
 //// let x10 = [|{|"parts": ["(","anonymous local class",")"], "kind": "local class"|}class implements Foo { hello() {} }|]
-//// let x11 = [|{|"parts": ["(","local class",")"," ","C"], "kind": "local class"|}class C implements Foo { hello() {} }|]
+//// let x11 = class [|{|"parts": ["(","local class",")"," ","C"], "kind": "local class"|}C|] implements Foo { hello() {} }
 ////
 //// // Should not do anything for type predicates
 //// function isFoo(a: any): a is Foo {
 ////     return true;
 //// }
 
-verify.allRangesAppearInImplementationList("interface_definition");
+verify.allRangesAppearInImplementationList("interface_definition");

tests/cases/fourslash/goToImplementationInterface_08.ts

@@ -11,7 +11,7 @@
 //// interface C extends B, A {}
 ////
 //// class X implements B {
-////     [|hello() {}|]
+////     [|hello|]() {}
 //// }
 ////
 //// function someFunction(d : A) {

tests/cases/fourslash/goToImplementationLocal_00.ts

@@ -3,6 +3,6 @@
 // Should return definition of locally declared functions
 
 //// he/*function_call*/llo();
-//// [|function hello() {}|]
+//// function [|hello|]() {}
 
-verify.allRangesAppearInImplementationList("function_call");
+verify.allRangesAppearInImplementationList("function_call");

tests/cases/fourslash/goToImplementationLocal_01.ts

@@ -2,7 +2,7 @@
 
 // Should return the defintion of locally defined variables
 
-//// const [|hello = function() {}|];
+//// const [|hello|] = function() {};
 //// he/*function_call*/llo();
 
-verify.allRangesAppearInImplementationList("function_call");
+verify.allRangesAppearInImplementationList("function_call");

tests/cases/fourslash/goToImplementationLocal_02.ts

@@ -1,8 +1,8 @@
 /// <reference path='fourslash.ts'/>
 
-//// const x = { [|hello: () => {}|] };
+//// const x = { [|hello|]: () => {} };
 ////
 //// x.he/*function_call*/llo();
 ////
 
-verify.allRangesAppearInImplementationList("function_call");
+verify.allRangesAppearInImplementationList("function_call");

tests/cases/fourslash/goToImplementationLocal_03.ts

@@ -2,11 +2,11 @@
 
 // Should return the definition when invoked on variable assignment
 
-//// let [|he/*local_var*/llo = {}|];
+//// let [|he/*local_var*/llo|] = {};
 ////
 //// x.hello();
 ////
 //// hello = {};
 ////
 
-verify.allRangesAppearInImplementationList("local_var");
+verify.allRangesAppearInImplementationList("local_var");

tests/cases/fourslash/goToImplementationLocal_04.ts

@@ -2,9 +2,9 @@
 
 // Should return definition of function when invoked on the declaration
 
-//// [|function he/*local_var*/llo() {}|]
+//// function [|he/*local_var*/llo|]() {}
 ////
 //// hello();
 ////
 
-verify.allRangesAppearInImplementationList("local_var");
+verify.allRangesAppearInImplementationList("local_var");

tests/cases/fourslash/goToImplementationLocal_05.ts

@@ -6,7 +6,7 @@
 ////     public hello() {}
 //// }
 ////
-//// var [|someVar = new Bar()|];
+//// var [|someVar|] = new Bar();
 //// someVa/*reference*/r.hello();
 
-verify.allRangesAppearInImplementationList("reference");
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationLocal_06.ts

@@ -2,7 +2,7 @@
 
 // Should be able to go to ambient variable declarations
 
-//// declare var [|someVar: string|];
+//// declare var [|someVar|]: string;
 //// someVa/*reference*/r
 
-verify.allRangesAppearInImplementationList("reference");
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationLocal_07.ts

@@ -2,7 +2,7 @@
 
 // Should be able to go to ambient function declarations
 
-//// [|declare function someFunction(): () => void;|]
+//// declare function [|someFunction|](): () => void;
 //// someFun/*reference*/ction();
 
-verify.allRangesAppearInImplementationList("reference");
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationLocal_08.ts

@@ -2,7 +2,7 @@
 
 // Should be able to go to ambient function declarations
 
-//// [|declare function someFunction(): () => void;|]
+//// declare function [|someFunction|](): () => void;
 //// someFun/*reference*/ction();
 
-verify.allRangesAppearInImplementationList("reference");
+verify.allRangesAppearInImplementationList("reference");