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

more strict type conversion #7340

Browse source
This commit is contained in:
Johannes Rieken 2018-03-02 17:08:27 +01:00
parent 9b363e8e61
commit e5be4d8f7d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View file

@ -469,7 +469,7 @@ class NavigateTypeAdapter {
}
interface RenameProvider2 extends vscode.RenameProvider {
resolveInitialRenameValue?(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): vscode.ProviderResult<any>;
resolveInitialRenameValue?(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): vscode.ProviderResult<vscode.RenameInitialValue>;
}
class RenameAdapter {
@ -522,10 +522,17 @@ class RenameAdapter {
let doc = this._documents.getDocumentData(resource).document;
let pos = TypeConverters.toPosition(position);
return asWinJsPromise(token => this._provider.resolveInitialRenameValue(doc, pos, token)).then((value) => {
return asWinJsPromise(token => this._provider.resolveInitialRenameValue(doc, pos, token)).then(value => {
if (!value) {
return undefined;
}
if (!value.range.contains(pos)) {
console.warn('INVALID rename information, must contain the request-position');
return undefined;
}
return <modes.RenameInformation>{
range: TypeConverters.fromRange(value.range),
text: value.text
text: value.text || doc.getText(value.range)
};
});
}