fix(typescript): do not reuse snapshot

volarjs · Mar 28, 2024 · c579f98 · c579f98
1 parent 044667b
commit c579f98
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/packages/typescript/lib/plugins/docCommentTemplate.ts b/packages/typescript/lib/plugins/docCommentTemplate.ts
@@ -13,7 +13,7 @@ export function create(ts: typeof import('typescript')): vscode.LanguageServiceP
 	return {
 		name: 'typescript-doc-comment-template',
 		triggerCharacters: ['*'],
-		create(context): vscode.LanguageServicePluginInstance {
+		create(): vscode.LanguageServicePluginInstance {
 
 			return {
 
@@ -27,7 +27,7 @@ export function create(ts: typeof import('typescript')): vscode.LanguageServiceP
 						return;
 					}
 
-					const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+					const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 					const offset = document.offsetAt(position);
 					const docCommentTemplate = languageService.getDocCommentTemplateAtPosition(fileName, offset);
 					if (!docCommentTemplate) {

diff --git a/packages/typescript/lib/plugins/syntactic.ts b/packages/typescript/lib/plugins/syntactic.ts
@@ -42,7 +42,7 @@ export function create(
 						&& lastChange.text.endsWith('>')
 						&& await isAutoClosingTagsEnabled(document, context)
 					) {
-						const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+						const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 						const close = languageService.getJsxClosingTagAtPosition(fileName, document.offsetAt(position));
 						if (close) {
 							return '$0' + close.newText;
@@ -56,7 +56,7 @@ export function create(
 						return;
 					}
 
-					const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+					const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 					const outliningSpans = safeCall(() => languageService.getOutliningSpans(fileName));
 					if (!outliningSpans) {
 						return [];
@@ -70,7 +70,7 @@ export function create(
 						return;
 					}
 
-					const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+					const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 					const barItems = safeCall(() => languageService.getNavigationTree(fileName));
 					if (!barItems) {
 						return [];
@@ -97,7 +97,7 @@ export function create(
 					if (codeOptions) {
 						tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
 					}
-					const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+					const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 					const scriptEdits = range
 						? safeCall(() => languageService.getFormattingEditsForRange(
 							fileName,
@@ -126,7 +126,7 @@ export function create(
 					if (codeOptions) {
 						tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
 					}
-					const { languageService, fileName } = getLanguageServiceByDocument(context, ts, document);
+					const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
 					const scriptEdits = safeCall(() => languageService.getFormattingEditsAfterKeystroke(fileName, document.offsetAt(position), key, tsOptions));
 					if (!scriptEdits) {
 						return [];
@@ -138,21 +138,16 @@ export function create(
 	};
 }
 
-export function getLanguageServiceByDocument(context: ServiceContext, ts: typeof import('typescript'), document: TextDocument) {
-	const decoded = context.decodeEmbeddedDocumentUri(document.uri);
-	if (decoded) {
-		const embeddedCode = context.language.scripts
-			.get(decoded[0])?.generated?.embeddedCodes
-			.get(decoded[1]);
-		if (embeddedCode) {
-			return getLanguageService(ts, embeddedCode.snapshot, document.languageId, true);
-		}
-	}
-	else {
-		const sourceScript = context.language.scripts.get(document.uri);
-		if (sourceScript) {
-			return getLanguageService(ts, sourceScript.snapshot, document.languageId, true);
-		}
+import type * as ts from 'typescript';
+
+const snapshots = new WeakMap<TextDocument, [number, ts.IScriptSnapshot]>();
+
+export function getLanguageServiceByDocument(ts: typeof import('typescript'), document: TextDocument) {
+	let cache = snapshots.get(document);
+	if (!cache || cache[0] !== document.version) {
+		const snapshot = ts.ScriptSnapshot.fromString(document.getText());
+		cache = [document.version, snapshot];
+		snapshots.set(document, cache);
 	}
-	throw new Error(`No language service for ${document.uri}`);
+	return getLanguageService(ts, cache[1], document.languageId, true);
 }