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

chore: optimized code

Browse Source
This commit is contained in:
chenjigeng
2020-12-02 23:00:23 +08:00
parent 3e22e6f412
commit c8e490e5e6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/html-language-features/server/src/modes/javascriptMode.ts
View File

@@ -191,11 +191,12 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
async doRename(document: TextDocument, position: Position, newName: string) { async doRename(document: TextDocument, position: Position, newName: string) {
const jsDocument = jsDocuments.get(document); const jsDocument = jsDocuments.get(document);
const jsLanguageService = await host.getLanguageService(jsDocument); const jsLanguageService = await host.getLanguageService(jsDocument);
const { canRename } = jsLanguageService.getRenameInfo(jsDocument.uri, jsDocument.offsetAt(position)); const jsDocumentPosition = jsDocument.offsetAt(position);
const { canRename } = jsLanguageService.getRenameInfo(jsDocument.uri, jsDocumentPosition);
if (!canRename) { if (!canRename) {
return null; return null;
} }
const renameInfos = jsLanguageService.findRenameLocations(jsDocument.uri, jsDocument.offsetAt(position), false, false); const renameInfos = jsLanguageService.findRenameLocations(jsDocument.uri, jsDocumentPosition, false, false);
const edits: TextEdit[] = []; const edits: TextEdit[] = [];
renameInfos?.map(renameInfo => { renameInfos?.map(renameInfo => {

4
extensions/html-language-features/server/src/test/rename.test.ts
View File

@@ -28,10 +28,6 @@ async function testRename(value: string, newName: string, expectedDocContent: st
assert.fail('No workspace edits'); assert.fail('No workspace edits');
} }
if (!workspaceEdit || !workspaceEdit.changes) {
assert.fail('No workspace edits');
}
const edits = workspaceEdit.changes[document.uri.toString()]; const edits = workspaceEdit.changes[document.uri.toString()];
if (!edits) { if (!edits) {
assert.fail(`No edits for file at ${document.uri.toString()}`); assert.fail(`No edits for file at ${document.uri.toString()}`);