Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #12688

Browse Source
This commit is contained in:
Johannes Rieken
2016-10-26 15:13:39 +02:00
parent 988ced7117
commit 2c09acb99e
2 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -113,22 +113,12 @@ class DefinitionAdapter {
let pos = TypeConverters.toPosition(position);
return asWinJsPromise(token => this._provider.provideDefinition(doc, pos, token)).then(value => {
if (Array.isArray(value)) {
return value.map(DefinitionAdapter._convertLocation);
return value.map(TypeConverters.location.from);
} else if (value) {
return DefinitionAdapter._convertLocation(value);
return TypeConverters.location.from(value);
}
});
}
private static _convertLocation(location: vscode.Location): modes.Location {
if (!location) {
return;
}
return <modes.Location>{
uri: location.uri,
range: TypeConverters.fromRange(location.range)
};
}
}
class HoverAdapter {
@@ -208,17 +198,10 @@ class ReferenceAdapter {
return asWinJsPromise(token => this._provider.provideReferences(doc, pos, context, token)).then(value => {
if (Array.isArray(value)) {
return value.map(ReferenceAdapter._convertLocation);
return value.map(TypeConverters.location.from);
}
});
}
private static _convertLocation(location: vscode.Location): modes.Location {
return <modes.Location>{
uri: location.uri,
range: TypeConverters.fromRange(location.range)
};
}
}
class QuickFixAdapter {

6
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -248,10 +248,10 @@ export function toSymbolInformation(bearing: IWorkspaceSymbol): types.SymbolInfo
export const location = {
from(value: types.Location): modes.Location {
from(value: vscode.Location): modes.Location {
return {
range: fromRange(value.range),
uri: value.uri
range: value.range && fromRange(value.range),
uri: <URI>value.uri
};
},
to(value: modes.Location): types.Location {