From 70aacef81887fb0ad3aa4077d17c6c765dda3106 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 13 Jun 2016 16:18:16 -0700
Subject: [PATCH] added gotodef

---
 src/server/session.ts | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 6b0dc2f22e9..8fcea1810a9 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -108,6 +108,7 @@ namespace ts.server {
         export const CompletionDetails = "completionEntryDetails";
         export const Configure = "configure";
         export const Definition = "definition";
+        export const DefinitionFull = "definition-full";
         export const Exit = "exit";
         export const Format = "format";
         export const Formatonkey = "formatonkey";
@@ -319,29 +320,34 @@ namespace ts.server {
             }
         }
 
-        private getDefinition(line: number, offset: number, fileName: string): protocol.FileSpan[] {
-            const file = ts.normalizePath(fileName);
+        private getDefinition(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.FileSpan[] | DefinitionInfo[] {
+            const file = ts.normalizePath(args.file);
             const project = this.projectService.getProjectForFile(file);
             if (!project) {
                 throw Errors.NoProject;
             }
 
             const scriptInfo = project.getScriptInfo(file);
-            const position = scriptInfo.lineOffsetToPosition(line, offset);
+            const position = this.getPosition(args, scriptInfo);;
 
             const definitions = project.languageService.getDefinitionAtPosition(file, position);
             if (!definitions) {
                 return undefined;
             }
 
-            return definitions.map(def => {
-                const defScriptInfo = project.getScriptInfo(def.fileName);
-                return {
-                    file: def.fileName,
-                    start: defScriptInfo.positionToLineOffset(def.textSpan.start),
-                    end: defScriptInfo.positionToLineOffset(ts.textSpanEnd(def.textSpan))
-                };
-            });
+            if (simplifiedResult) {
+                return definitions.map(def => {
+                    const defScriptInfo = project.getScriptInfo(def.fileName);
+                    return {
+                        file: def.fileName,
+                        start: defScriptInfo.positionToLineOffset(def.textSpan.start),
+                        end: defScriptInfo.positionToLineOffset(ts.textSpanEnd(def.textSpan))
+                    };
+                });
+            }
+            else {
+                return definitions;
+            }
         }
 
         private getTypeDefinition(line: number, offset: number, fileName: string): protocol.FileSpan[] {
@@ -1086,9 +1092,11 @@ namespace ts.server {
                 this.exit();
                 return this.notRequired();
             },
-            [CommandNames.Definition]: (request: protocol.Request) => {
-                const defArgs = <protocol.FileLocationRequestArgs>request.arguments;
-                return this.requiredResponse(this.getDefinition(defArgs.line, defArgs.offset, defArgs.file));
+            [CommandNames.Definition]: (request: protocol.DefinitionRequest) => {
+                return this.requiredResponse(this.getDefinition(request.arguments, /*simplifiedResult*/ true));
+            },
+            [CommandNames.DefinitionFull]: (request: protocol.DefinitionRequest) => {
+                return this.requiredResponse(this.getDefinition(request.arguments, /*simplifiedResult*/ false));
             },
             [CommandNames.TypeDefinition]: (request: protocol.Request) => {
                 const defArgs = <protocol.FileLocationRequestArgs>request.arguments;