Add a new findReferences API that buckets results with the definition th...

src/compiler/checker.ts

@@ -7,6 +7,15 @@ module ts {
 
     /* @internal */ export let checkTime = 0;
 
+    /* @internal */
+    export function getSymbolId(symbol: Symbol): number {
+        if (!symbol.id) {
+            symbol.id = nextSymbolId++;
+        }
+
+        return symbol.id;
+    }
+
     export function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker {
         let Symbol = objectAllocator.getSymbolConstructor();
         let Type = objectAllocator.getTypeConstructor();
@@ -250,8 +259,8 @@ module ts {
 
         function getSymbolLinks(symbol: Symbol): SymbolLinks {
             if (symbol.flags & SymbolFlags.Transient) return <TransientSymbol>symbol;
-            if (!symbol.id) symbol.id = nextSymbolId++;
-            return symbolLinks[symbol.id] || (symbolLinks[symbol.id] = {});
+            var id = getSymbolId(symbol);
+            return symbolLinks[id] || (symbolLinks[id] = {});
         }
 
         function getNodeLinks(node: Node): NodeLinks {

src/harness/harnessLanguageService.ts

@@ -330,6 +330,9 @@ module Harness.LanguageService {
         getReferencesAtPosition(fileName: string, position: number): ts.ReferenceEntry[] {
             return unwrapJSONCallResult(this.shim.getReferencesAtPosition(fileName, position));
         }
+        findReferences(fileName: string, position: number): ts.ReferencedSymbol[] {
+            return unwrapJSONCallResult(this.shim.findReferences(fileName, position));
+        }
         getOccurrencesAtPosition(fileName: string, position: number): ts.ReferenceEntry[] {
             return unwrapJSONCallResult(this.shim.getOccurrencesAtPosition(fileName, position));
         }

src/server/client.ts

@@ -300,6 +300,11 @@ module ts.server {
             });
         }
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[]{
+            // Not yet implemented.
+            return [];
+        }
+
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
             var lineOffset = this.positionToOneBasedLineOffset(fileName, position);
             var args: protocol.FileLocationRequestArgs = {

src/services/shims.ts

@@ -127,6 +127,12 @@ module ts {
          * { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean }[]
          */
         getReferencesAtPosition(fileName: string, position: number): string;
+
+        /**
+         * Returns a JSON-encoded value of the type:
+         * { definition: <encoded>; references: <encoded>[] }[]
+         */
+        findReferences(fileName: string, position: number): string;
 
         /**
          * Returns a JSON-encoded value of the type:
@@ -555,11 +561,6 @@ module ts {
 
         /// GET REFERENCES
 
-        /**
-         * Return references to a symbol at the requested position.
-         * References are separated by "\n".
-         * Each reference is a "fileindex min lim" sub-string.
-         */
         public getReferencesAtPosition(fileName: string, position: number): string {
             return this.forwardJSONCall(
                 "getReferencesAtPosition('" + fileName + "', " + position + ")",
@@ -568,6 +569,14 @@ module ts {
                 });
         }
 
+        public findReferences(fileName: string, position: number): string {
+            return this.forwardJSONCall(
+                "findReferences('" + fileName + "', " + position + ")",
+                () => {
+                    return this.languageService.findReferences(fileName, position);
+                });
+        }
+
         public getOccurrencesAtPosition(fileName: string, position: number): string {
             return this.forwardJSONCall(
                 "getOccurrencesAtPosition('" + fileName + "', " + position + ")",

tests/baselines/reference/APISample_compile.js

@@ -1589,6 +1589,7 @@ declare module "typescript" {
         getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
         getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
         getNavigationBarItems(fileName: string): NavigationBarItem[];
         getOutliningSpans(fileName: string): OutliningSpan[];
@@ -1675,6 +1676,10 @@ declare module "typescript" {
         containerKind: string;
         containerName: string;
     }
+    interface ReferencedSymbol {
+        definition: DefinitionInfo;
+        references: ReferenceEntry[];
+    }
     enum SymbolDisplayPartKind {
         aliasName = 0,
         className = 1,

tests/baselines/reference/APISample_compile.types

@@ -5154,6 +5154,12 @@ declare module "typescript" {
 >position : number
 >ReferenceEntry : ReferenceEntry
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
+>findReferences : (fileName: string, position: number) => ReferencedSymbol[]
+>fileName : string
+>position : number
+>ReferencedSymbol : ReferencedSymbol
+
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
 >getNavigateToItems : (searchValue: string, maxResultCount?: number) => NavigateToItem[]
 >searchValue : string
@@ -5424,6 +5430,17 @@ declare module "typescript" {
 
         containerName: string;
 >containerName : string
+    }
+    interface ReferencedSymbol {
+>ReferencedSymbol : ReferencedSymbol
+
+        definition: DefinitionInfo;
+>definition : DefinitionInfo
+>DefinitionInfo : DefinitionInfo
+
+        references: ReferenceEntry[];
+>references : ReferenceEntry[]
+>ReferenceEntry : ReferenceEntry
     }
     enum SymbolDisplayPartKind {
 >SymbolDisplayPartKind : SymbolDisplayPartKind

tests/baselines/reference/APISample_linter.js

@@ -1620,6 +1620,7 @@ declare module "typescript" {
         getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
         getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
         getNavigationBarItems(fileName: string): NavigationBarItem[];
         getOutliningSpans(fileName: string): OutliningSpan[];
@@ -1706,6 +1707,10 @@ declare module "typescript" {
         containerKind: string;
         containerName: string;
     }
+    interface ReferencedSymbol {
+        definition: DefinitionInfo;
+        references: ReferenceEntry[];
+    }
     enum SymbolDisplayPartKind {
         aliasName = 0,
         className = 1,

tests/baselines/reference/APISample_linter.types

@@ -5300,6 +5300,12 @@ declare module "typescript" {
 >position : number
 >ReferenceEntry : ReferenceEntry
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
+>findReferences : (fileName: string, position: number) => ReferencedSymbol[]
+>fileName : string
+>position : number
+>ReferencedSymbol : ReferencedSymbol
+
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
 >getNavigateToItems : (searchValue: string, maxResultCount?: number) => NavigateToItem[]
 >searchValue : string
@@ -5570,6 +5576,17 @@ declare module "typescript" {
 
         containerName: string;
 >containerName : string
+    }
+    interface ReferencedSymbol {
+>ReferencedSymbol : ReferencedSymbol
+
+        definition: DefinitionInfo;
+>definition : DefinitionInfo
+>DefinitionInfo : DefinitionInfo
+
+        references: ReferenceEntry[];
+>references : ReferenceEntry[]
+>ReferenceEntry : ReferenceEntry
     }
     enum SymbolDisplayPartKind {
 >SymbolDisplayPartKind : SymbolDisplayPartKind

tests/baselines/reference/APISample_transform.js

@@ -1621,6 +1621,7 @@ declare module "typescript" {
         getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
         getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
         getNavigationBarItems(fileName: string): NavigationBarItem[];
         getOutliningSpans(fileName: string): OutliningSpan[];
@@ -1707,6 +1708,10 @@ declare module "typescript" {
         containerKind: string;
         containerName: string;
     }
+    interface ReferencedSymbol {
+        definition: DefinitionInfo;
+        references: ReferenceEntry[];
+    }
     enum SymbolDisplayPartKind {
         aliasName = 0,
         className = 1,

tests/baselines/reference/APISample_transform.types

@@ -5250,6 +5250,12 @@ declare module "typescript" {
 >position : number
 >ReferenceEntry : ReferenceEntry
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
+>findReferences : (fileName: string, position: number) => ReferencedSymbol[]
+>fileName : string
+>position : number
+>ReferencedSymbol : ReferencedSymbol
+
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
 >getNavigateToItems : (searchValue: string, maxResultCount?: number) => NavigateToItem[]
 >searchValue : string
@@ -5520,6 +5526,17 @@ declare module "typescript" {
 
         containerName: string;
 >containerName : string
+    }
+    interface ReferencedSymbol {
+>ReferencedSymbol : ReferencedSymbol
+
+        definition: DefinitionInfo;
+>definition : DefinitionInfo
+>DefinitionInfo : DefinitionInfo
+
+        references: ReferenceEntry[];
+>references : ReferenceEntry[]
+>ReferenceEntry : ReferenceEntry
     }
     enum SymbolDisplayPartKind {
 >SymbolDisplayPartKind : SymbolDisplayPartKind

tests/baselines/reference/APISample_watcher.js

@@ -1658,6 +1658,7 @@ declare module "typescript" {
         getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
         getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
         getNavigationBarItems(fileName: string): NavigationBarItem[];
         getOutliningSpans(fileName: string): OutliningSpan[];
@@ -1744,6 +1745,10 @@ declare module "typescript" {
         containerKind: string;
         containerName: string;
     }
+    interface ReferencedSymbol {
+        definition: DefinitionInfo;
+        references: ReferenceEntry[];
+    }
     enum SymbolDisplayPartKind {
         aliasName = 0,
         className = 1,

tests/baselines/reference/APISample_watcher.types

@@ -5423,6 +5423,12 @@ declare module "typescript" {
 >position : number
 >ReferenceEntry : ReferenceEntry
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[];
+>findReferences : (fileName: string, position: number) => ReferencedSymbol[]
+>fileName : string
+>position : number
+>ReferencedSymbol : ReferencedSymbol
+
         getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
 >getNavigateToItems : (searchValue: string, maxResultCount?: number) => NavigateToItem[]
 >searchValue : string
@@ -5693,6 +5699,17 @@ declare module "typescript" {
 
         containerName: string;
 >containerName : string
+    }
+    interface ReferencedSymbol {
+>ReferencedSymbol : ReferencedSymbol
+
+        definition: DefinitionInfo;
+>definition : DefinitionInfo
+>DefinitionInfo : DefinitionInfo
+
+        references: ReferenceEntry[];
+>references : ReferenceEntry[]
+>ReferenceEntry : ReferenceEntry
     }
     enum SymbolDisplayPartKind {
 >SymbolDisplayPartKind : SymbolDisplayPartKind

tests/cases/fourslash/findAllRefsInsideWithBlock.ts

@@ -13,4 +13,4 @@ goTo.marker('1');
 verify.referencesCountIs(3);
 
 goTo.marker('2');
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);

tests/cases/fourslash/getOccurrencesOfUndefinedSymbol.ts

@@ -17,4 +17,4 @@
 
 // "any" should not be highlighted
 goTo.marker();
-verify.occurrencesAtPositionCount(1);
+verify.occurrencesAtPositionCount(0);

tests/cases/fourslash/getOccurrencesSwitchCaseDefaultBroken.ts

@@ -39,15 +39,15 @@ for (var i = 1; i <= test.markers().length; i++) {
             verify.occurrencesAtPositionCount(8);
             break;
         case 4:
-        case 5:
-        case 8:
             verify.occurrencesAtPositionCount(1);
             break;
         case 6:
         case 7:
         case 9:
             verify.occurrencesAtPositionCount(8);
             break;
+        case 5:
+        case 8:
         case 10:
         case 11:
         case 12:

tests/cases/fourslash/getOccurrencesThisNegatives2.ts

@@ -143,5 +143,5 @@
 
 test.markers().forEach(m => {
     goTo.position(m.position, m.fileName)
-    verify.occurrencesAtPositionCount(1);
+    verify.occurrencesAtPositionCount(0);
 });

tests/cases/fourslash/getOccurrencesTryCatchFinallyBroken.ts

@@ -36,6 +36,8 @@ for (var i = 1; i <= test.markers().length; i++) {
 
     switch (i) {
         case 1:
+            verify.occurrencesAtPositionCount(0);
+            break;
         case 2:
         case 3:
             verify.occurrencesAtPositionCount(1);

tests/cases/fourslash/localGetReferences.ts

@@ -223,7 +223,7 @@ verify.referencesCountIs(7);
 
 // References to unresolved symbol.
 goTo.marker("12");
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);
 
 // References to no context.
 goTo.marker("13");

tests/cases/fourslash/referencesForIllegalAssignment.ts

@@ -6,10 +6,10 @@
 ////ba/*4*/r = b/*5*/ar + 1;
 
 goTo.marker("1");
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);
 
 goTo.marker("2");
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);
 
 goTo.marker("3");
 verify.referencesCountIs(3);

tests/cases/fourslash/referencesForIndexProperty2.ts

@@ -6,4 +6,4 @@
 ////a[/*1*/"blah"];
 
 goTo.marker("1");
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);

tests/cases/fourslash/referencesForLabel2.ts

@@ -9,4 +9,4 @@
 ////}
 
 goTo.marker("1");
-verify.referencesCountIs(1);
+verify.referencesCountIs(0);