Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 19:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

use rename info instead of highlight info

Browse Source
This commit is contained in:
Johannes Rieken
2020-11-12 21:07:45 +01:00
parent ce7bd67d46
commit 165e49bfe8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/typescript-language-features/src/languageFeatures/renameOnType.ts
View File

@@ -5,7 +5,6 @@
import * as vscode from 'vscode';
import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
import { flatten } from '../utils/arrays';
import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration';
import { DocumentSelector } from '../utils/documentSelector';
import * as typeConverters from '../utils/typeConverters';
@@ -42,16 +41,16 @@ class TypeScriptOnTypeRenameProvider implements vscode.OnTypeRenameProvider {
return undefined;
}
const highlightsResponse = await this.client.interruptGetErr(() => this.client.execute('documentHighlights', { ...args, filesToSearch: [file] }, token));
if (highlightsResponse.type !== 'response' || !highlightsResponse.body) {
const renameResponse = await this.client.execute('rename', args, token);
if (!renameResponse || renameResponse.type !== 'response' || !renameResponse.body) {
return undefined;
}
const ranges = flatten(
highlightsResponse.body
.filter(highlight => highlight.file === file)
.map(highlight => highlight.highlightSpans.map(typeConverters.Range.fromTextSpan)));
if (renameResponse.body.locs.length !== 1 || renameResponse.body.locs[0].file !== file) {
return undefined; // not a local?
}
const ranges = renameResponse.body.locs[0].locs.map(typeConverters.Range.fromTextSpan);
return new vscode.OnTypeRenameRanges(ranges);
}