From 16bdaaa0a6db70a3594d3e847545e6ce370ce620 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 11:04:23 -0800
Subject: [PATCH] Fix positionToLineOffset conversion for getImplementation

---
 src/server/session.ts                         | 16 +++++++++-------
 .../goToImplementation_inDifferentFiles.ts    | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts

diff --git a/src/server/session.ts b/src/server/session.ts
index 1fa3986f66f..825ad8506d7 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -484,18 +484,20 @@ namespace ts.server {
 
         private getImplementation(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.FileSpan[] | ImplementationLocation[] {
             const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file);
-            const position = this.getPosition(args, scriptInfo);
+            const position = this.getPosition(args, project.getScriptInfoForNormalizedPath(file));
             const implementations = project.getLanguageService().getImplementationAtPosition(file, position);
             if (!implementations) {
                 return [];
             }
             if (simplifiedResult) {
-                return implementations.map(impl => ({
-                    file: impl.fileName,
-                    start: scriptInfo.positionToLineOffset(impl.textSpan.start),
-                    end: scriptInfo.positionToLineOffset(ts.textSpanEnd(impl.textSpan))
-                }));
+                return implementations.map(({ fileName, textSpan }) => {
+                    const scriptInfo = project.getScriptInfo(fileName);
+                    return {
+                        file: fileName,
+                        start: scriptInfo.positionToLineOffset(textSpan.start),
+                        end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan))
+                    };
+                });
             }
             else {
                 return implementations;
diff --git a/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
new file mode 100644
index 00000000000..e4289b83102
--- /dev/null
+++ b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
@@ -0,0 +1,19 @@
+/// <reference path='../fourslash.ts'/>
+
+// @Filename: /bar.ts
+////import {Foo} from './foo'
+////
+////[|class A implements Foo {
+////    func() {}
+////}|]
+////
+////[|class B implements Foo {
+////    func() {}
+////}|]
+
+// @Filename: /foo.ts
+////export interface /**/Foo {
+////    func();
+////}
+
+verify.allRangesAppearInImplementationList("");