Merge pull request #2666 from Microsoft/occurrencesOnServer

Support getOccurrences on the TS Server

Author: DanielRosenwasser

src/server/client.ts

@@ -104,7 +104,7 @@ module ts.server {
                 var response: T = JSON.parse(responseBody);
             }
             catch (e) {
-                throw new Error("Malformed response: Failed to parse server response: " + lastMessage + ". \r\n  Error detailes: " + e.message);
+                throw new Error("Malformed response: Failed to parse server response: " + lastMessage + ". \r\n  Error details: " + e.message);
             }
 
             // verify the sequence numbers
@@ -446,6 +446,7 @@ module ts.server {
             if (!response.body) {
                 return undefined;
             }
+
             var helpItems: protocol.SignatureHelpItems = response.body;
             var span = helpItems.applicableSpan;
             var start = this.lineOffsetToPosition(fileName, span.start);
@@ -465,7 +466,26 @@ module ts.server {
         }
 
         getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
-            throw new Error("Not Implemented Yet.");
+            var lineOffset = this.positionToOneBasedLineOffset(fileName, position);
+            var args: protocol.FileLocationRequestArgs = {
+                file: fileName,
+                line: lineOffset.line,
+                offset: lineOffset.offset,
+            };
+
+            var request = this.processRequest<protocol.OccurrencesRequest>(CommandNames.Occurrences, args);
+            var response = this.processResponse<protocol.OccurrencesResponse>(request);
+
+            return response.body.map(entry => {
+                var fileName = entry.file;
+                var start = this.lineOffsetToPosition(fileName, entry.start);
+                var end = this.lineOffsetToPosition(fileName, entry.end);
+                return {
+                    fileName,
+                    textSpan: ts.createTextSpanFromBounds(start, end),
+                    isWriteAccess: entry.isWriteAccess,
+                };
+            });
         }
 
         getOutliningSpans(fileName: string): OutliningSpan[] {

src/server/protocol.d.ts

@@ -165,6 +165,25 @@ declare module ts.server.protocol {
         body?: FileSpan[];
     }
 
+    /**
+      * Get occurrences request; value of command field is
+      * "occurrences". Return response giving spans that are relevant
+      * in the file at a given line and column.
+      */
+    export interface OccurrencesRequest extends FileLocationRequest {
+    }
+
+    export interface OccurrencesResponseItem extends FileSpan {
+        /**
+          * True if the occurrence is a write location, false otherwise.
+          */
+        isWriteAccess: boolean;
+    }
+
+    export interface OccurrencesResponse extends Response {
+        body?: OccurrencesResponseItem[];
+    }
+
     /**
       * Find references request; value of command field is
       * "references". Return response giving the file locations that

src/server/session.ts

@@ -1,4 +1,4 @@
-/// <reference path="fourslash.ts"/>
+/// <reference path="../fourslash.ts"/>
 
 //////curly braces
 ////module Foo [|{

tests/cases/fourslash/server/brace.ts renamed to tests/cases/fourslash/server/brace01.ts

@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts'/>
+/// <reference path="../fourslash.ts"/>
 
 ////var x: string[] = [];
 ////x.forEach(function (y) { y/*1*/

tests/cases/fourslash/server/completions.ts renamed to tests/cases/fourslash/server/completions01.ts

@@ -1,4 +1,4 @@
-/// <reference path="fourslash.ts" />
+/// <reference path="../fourslash.ts"/>
 
 ////class Foo {
 ////}

tests/cases/fourslash/server/completions2.ts renamed to tests/cases/fourslash/server/completions02.ts

@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts'/>
+/// <reference path="../fourslash.ts"/>
 
 // @Filename: b.ts
 ////import n = require('a/*1*/');

tests/cases/fourslash/server/definition.ts renamed to tests/cases/fourslash/server/definition01.ts

@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts' />
+/// <reference path="../fourslash.ts"/>
 
 /////**/module Default{var x= ( { } ) ;}
 

tests/cases/fourslash/server/format.ts renamed to tests/cases/fourslash/server/format01.ts

@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts' />
+/// <reference path="../fourslash.ts"/>
 
 ////switch (1) {
 ////    case 1:

tests/cases/fourslash/server/formatonkey.ts renamed to tests/cases/fourslash/server/formatonkey01.ts

@@ -1,4 +1,4 @@
-/// <reference path="fourslash.ts"/>
+/// <reference path="../fourslash.ts"/>
 
 ////// Interface
 ////{| "itemName": "IPoint", "kind": "interface", "parentName": "" |}interface IPoint {