fix: a race condition that caused partials not to be parsed sometimes

wkillerud · Aug 20, 2024 · 6d23443 · 6d23443
1 parent 5cc973d
commit 6d23443
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/language-server/src/workspace-scanner.ts b/packages/language-server/src/workspace-scanner.ts
@@ -53,21 +53,17 @@ export default class WorkspaceScanner {
 			uri = URI.parse(file.toString().replace("/static/extensions/fs", ""));
 		}
 
-		const alreadyParsed = this.#ls.hasCached(uri);
-		if (alreadyParsed) {
-			// The same file may be referenced by multiple other files,
-			// so skip doing the parsing work if it's already been done.
-			// Changes to the file are handled by the `update` method.
-			return;
-		}
-
 		try {
-			const content = await this.#fs.readFile(uri);
+			let document: TextDocument | null | undefined =
+				this.#ls.getCachedTextDocument(uri);
+			if (!document) {
+				const content = await this.#fs.readFile(uri);
 
-			const document = getSCSSRegionsDocument(
-				TextDocument.create(uri.toString(), "scss", 1, content),
-			);
-			if (!document) return;
+				document = getSCSSRegionsDocument(
+					TextDocument.create(uri.toString(), "scss", 1, content),
+				);
+				if (!document) return;
+			}
 
 			this.#ls.parseStylesheet(document);
 

diff --git a/packages/language-services/src/language-model-cache.ts b/packages/language-services/src/language-model-cache.ts
@@ -128,6 +128,10 @@ export class LanguageModelCache {
 		return Object.values(this.#languageModels).map((cached) => cached.document);
 	}
 
+	getCachedTextDocument(uri: string): TextDocument | undefined {
+		return this.#languageModels[uri]?.document;
+	}
+
 	has(uri: string) {
 		return typeof this.#languageModels[uri] !== "undefined";
 	}

diff --git a/packages/language-services/src/language-services-types.ts b/packages/language-services/src/language-services-types.ts
@@ -133,7 +133,7 @@ export interface LanguageService {
 		range: Range,
 		context?: CodeActionContext,
 	): Promise<CodeAction[]>;
-	hasCached(uri: URI): boolean;
+	getCachedTextDocument(uri: URI): TextDocument | undefined;
 	/**
 	 * Utility function to reparse an updated document.
 	 * Like {@link LanguageService.parseStylesheet}, but returns nothing.

diff --git a/packages/language-services/src/language-services.ts b/packages/language-services/src/language-services.ts
@@ -160,8 +160,8 @@ class LanguageServiceImpl implements LanguageService {
 		return this.#findSymbols.findWorkspaceSymbols(query);
 	}
 
-	hasCached(uri: URI): boolean {
-		return this.#cache.has(uri.toString());
+	getCachedTextDocument(uri: URI): TextDocument | undefined {
+		return this.#cache.getCachedTextDocument(uri.toString());
 	}
 
 	getColorPresentations(document: TextDocument, color: Color, range: Range) {