From c8e490e5e683f346d3a1dbc4c99f6d8f253f545e Mon Sep 17 00:00:00 2001
From: chenjigeng <178854407@qq.com>
Date: Wed, 2 Dec 2020 23:00:23 +0800
Subject: [PATCH] chore: optimized code

---
 .../server/src/modes/javascriptMode.ts                       | 5 +++--
 .../html-language-features/server/src/test/rename.test.ts    | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 97299fe8ab8..bb630594852 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -191,11 +191,12 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		async doRename(document: TextDocument, position: Position, newName: string) {
 			const jsDocument = jsDocuments.get(document);
 			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) {
 				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[] = [];
 			renameInfos?.map(renameInfo => {
diff --git a/extensions/html-language-features/server/src/test/rename.test.ts b/extensions/html-language-features/server/src/test/rename.test.ts
index b1578fcd270..2705b56fdf8 100644
--- a/extensions/html-language-features/server/src/test/rename.test.ts
+++ b/extensions/html-language-features/server/src/test/rename.test.ts
@@ -28,10 +28,6 @@ async function testRename(value: string, newName: string, expectedDocContent: st
 			assert.fail('No workspace edits');
 		}
 
-		if (!workspaceEdit || !workspaceEdit.changes) {
-			assert.fail('No workspace edits');
-		}
-
 		const edits = workspaceEdit.changes[document.uri.toString()];
 		if (!edits) {
 			assert.fail(`No edits for file at ${document.uri.toString()}`);