Add isDefinition to ReferenceEntry

sandersn · sandersn · commit 5a7f7469eae8 · 2016-06-13T13:21:47.000-07:00
Clients can now easily tell if the reference is to a definition or a
usage.
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -376,6 +376,7 @@ namespace ts.server {
                     fileName: fileName,
                     textSpan: ts.createTextSpanFromBounds(start, end),
                     isWriteAccess: entry.isWriteAccess,
+                    isDefinition: entry.isDefinition,
                 };
             });
         }
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
@@ -304,6 +304,11 @@ declare namespace ts.server.protocol {
           * True if reference is a write location, false otherwise.
           */
         isWriteAccess: boolean;
+
+        /**
+         * True if reference is a definition, false otherwise.
+         */
+        isDefinition?: boolean;
     }
 
     /**
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -379,7 +379,7 @@ namespace ts.server {
                     start,
                     end,
                     file: fileName,
-                    isWriteAccess
+                    isWriteAccess,
                 };
             });
         }
@@ -555,7 +555,8 @@ namespace ts.server {
                             start: start,
                             lineText: lineText,
                             end: compilerService.host.positionToLineOffset(ref.fileName, ts.textSpanEnd(ref.textSpan)),
-                            isWriteAccess: ref.isWriteAccess
+                            isWriteAccess: ref.isWriteAccess,
+                            isDefinition: ref.isDefinition
                         };
                     });
                 },
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1208,6 +1208,7 @@ namespace ts {
         textSpan: TextSpan;
         fileName: string;
         isWriteAccess: boolean;
+        isDefinition?: boolean;
     }
 
     export interface DocumentHighlights {
@@ -6183,7 +6184,8 @@ namespace ts {
                                     references: [{
                                         fileName: sourceFile.fileName,
                                         textSpan: createTextSpan(position, searchText.length),
-                                        isWriteAccess: false
+                                        isWriteAccess: false,
+                                        isDefinition: false
                                     }]
                                 });
                             }
@@ -6737,7 +6739,8 @@ namespace ts {
             return {
                 fileName: node.getSourceFile().fileName,
                 textSpan: createTextSpanFromBounds(start, end),
-                isWriteAccess: isWriteAccess(node)
+                isWriteAccess: isWriteAccess(node),
+                isDefinition: isDeclarationName(node)
             };
         }
 
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -164,7 +164,7 @@ namespace ts {
 
         /**
          * Returns a JSON-encoded value of the type:
-         * { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean }[]
+         * { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean, isDefinition?: boolean }[]
          */
         getReferencesAtPosition(fileName: string, position: number): string;
 
@@ -1141,4 +1141,4 @@ namespace TypeScript.Services {
 /* @internal */
 const toolsVersion = "1.9";
 
-/* tslint:enable:no-unused-variable */
+/* tslint:enable:no-unused-variable */

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ namespace ts.server {`
`376`	`376`	`fileName: fileName,`
`377`	`377`	`textSpan: ts.createTextSpanFromBounds(start, end),`
`378`	`378`	`isWriteAccess: entry.isWriteAccess,`
	`379`	`+ isDefinition: entry.isDefinition,`
`379`	`380`	`};`
`380`	`381`	`});`
`381`	`382`	`}`