maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix positionToLineOffset conversion for getImplementation

Browse source
This commit is contained in:
Andy Hanson 2017-01-25 11:04:23 -08:00
parent abc30b26c7
commit 16bdaaa0a6
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/server/session.ts
View file

@ -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;

19
tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts Normal file
View file

@ -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("");