fix: force update vue source file before format

close #1840, close #1842, close #1843
vuejs · Sep 7, 2022 · da19999 · da19999
1 parent ce2be82
commit da19999
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/vue-language-service/src/documentFeatures/format.ts b/packages/vue-language-service/src/documentFeatures/format.ts
@@ -23,11 +23,11 @@ export function register(context: DocumentServiceRuntimeContext) {
 			range = vscode.Range.create(document.positionAt(0), document.positionAt(document.getText().length));
 		}
 
+		const vueDocument = context.getAndUpdateVueDocument(document);
 		const originalDocument = document;
 		const rootEdits = onTypeParams
 			? await tryFormat(document, onTypeParams.position, undefined, onTypeParams.ch)
 			: await tryFormat(document, range, undefined);
-		const vueDocument = context.getVueDocument(document);
 
 		if (!vueDocument)
 			return rootEdits;

diff --git a/packages/vue-language-service/src/documentService.ts b/packages/vue-language-service/src/documentService.ts
@@ -72,7 +72,7 @@ export function getDocumentService(
 
 	const context: DocumentServiceRuntimeContext = {
 		typescript: ts,
-		getVueDocument,
+		getAndUpdateVueDocument,
 		getPlugins() {
 			return [
 				...customPlugins,
@@ -105,7 +105,7 @@ export function getDocumentService(
 		doAutoInsert: autoInsert.register(context),
 	};
 
-	function getVueDocument(document: TextDocument) {
+	function getAndUpdateVueDocument(document: TextDocument) {
 
 		let vueDoc = vueDocuments.get(document);
 

diff --git a/packages/vue-language-service/src/types.ts b/packages/vue-language-service/src/types.ts
@@ -6,7 +6,7 @@ import { VueDocument, VueDocuments } from './vueDocuments';
 
 export interface DocumentServiceRuntimeContext {
 	typescript: typeof import('typescript/lib/tsserverlibrary');
-	getVueDocument(document: TextDocument): VueDocument | undefined;
+	getAndUpdateVueDocument(document: TextDocument): VueDocument | undefined;
 	getPlugins(): EmbeddedLanguageServicePlugin[];
 	updateTsLs(document: TextDocument): void;
 };

diff --git a/packages/vue-language-service/src/utils/featureWorkers.ts b/packages/vue-language-service/src/utils/featureWorkers.ts
@@ -35,7 +35,7 @@ export async function documentArgFeatureWorker<T, K>(
 	combineResult?: (results: NonNullable<Awaited<T>>[]) => NonNullable<Awaited<T>>,
 ) {
 
-	const vueDocument = context.getVueDocument(document);
+	const vueDocument = context.getAndUpdateVueDocument(document);
 
 	let results: NonNullable<Awaited<T>>[] = [];