fix: update imports on file move not working

close #1599
vuejs · Jul 19, 2022 · 662ee29 · 662ee29
1 parent ecd9a63
commit 662ee29
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/vue-language-service/src/languageFeatures/fileRename.ts b/packages/vue-language-service/src/languageFeatures/fileRename.ts
@@ -1,6 +1,7 @@
 import type { LanguageServiceRuntimeContext } from '../types';
 import { embeddedEditToSourceEdit } from './rename';
 import type * as _ from 'vscode-languageserver-protocol';
+import * as dedupe from '../utils/dedupe';
 
 export function register(context: LanguageServiceRuntimeContext) {
 
@@ -23,10 +24,17 @@ export function register(context: LanguageServiceRuntimeContext) {
 			const workspaceEdit = await plugin.doFileRename(oldUri, newUri);
 
 			if (workspaceEdit) {
-				return embeddedEditToSourceEdit(
+
+				const result = embeddedEditToSourceEdit(
 					workspaceEdit,
 					context.vueDocuments,
 				);
+
+				if (result?.documentChanges) {
+					result.documentChanges = dedupe.withDocumentChanges(result.documentChanges);
+				}
+
+				return result;
 			}
 		}
 	};

diff --git a/packages/vue-language-service/src/utils/dedupe.ts b/packages/vue-language-service/src/utils/dedupe.ts
@@ -43,6 +43,9 @@ export function withTextEdits<T extends vscode.TextEdit>(items: T[]): T[] {
 		item.newText,
 	].join(':'));
 }
+export function withDocumentChanges(items: NonNullable<vscode.WorkspaceEdit['documentChanges']>) {
+	return dedupe(items, item => JSON.stringify(item)); // TODO: improve this
+}
 export function withDiagnostics<T extends vscode.Diagnostic>(items: T[]): T[] {
 	return dedupe(items, item => [
 		item.range.start.line,