feat: Update to Volar 2.4.0 (#938)

* feat: Update to Volar 2.4.0 * Update init.test.ts * Update init.test.ts * Update server.ts * chore: changeset --------- Co-authored-by: Princesseuh <[email protected]>
withastro · Aug 18, 2024 · 28dfebe · 28dfebe
1 parent b52c0f4
commit 28dfebe
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 147 deletions.
diff --git a/.changeset/tender-jobs-tickle.md b/.changeset/tender-jobs-tickle.md
@@ -0,0 +1,9 @@
+---
+"@astrojs/language-server": patch
+"@astrojs/check": patch
+"@astrojs/ts-plugin": patch
+"@astrojs/yaml2ts": patch
+"astro-vscode": patch
+---
+
+Updates to the stable version of Volar 2.4.0
diff --git a/packages/astro-check/src/index.ts b/packages/astro-check/src/index.ts
@@ -39,9 +39,7 @@ export async function check(flags: Partial<Flags>): Promise<boolean | void> {
 
 		// Dynamically get the list of extensions to watch from the files already included in the project
 		const checkedExtensions = Array.from(
-			new Set(
-				checker.linter.projectHost.getScriptFileNames().map((fileName) => path.extname(fileName)),
-			),
+			new Set(checker.linter.getRootFileNames().map((fileName) => path.extname(fileName))),
 		);
 		createWatcher(workspaceRoot, checkedExtensions)
 			.on('add', (fileName) => {

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -30,20 +30,20 @@
     "@astrojs/compiler": "^2.10.3",
     "@astrojs/yaml2ts": "^0.2.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.4.0-alpha.15",
-    "@volar/language-core": "~2.4.0-alpha.15",
-    "@volar/language-server": "~2.4.0-alpha.15",
-    "@volar/language-service": "~2.4.0-alpha.15",
-    "@volar/typescript": "~2.4.0-alpha.15",
+    "@volar/kit": "~2.4.0",
+    "@volar/language-core": "~2.4.0",
+    "@volar/language-server": "~2.4.0",
+    "@volar/language-service": "~2.4.0",
+    "@volar/typescript": "~2.4.0",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.4.1",
-    "volar-service-css": "0.0.59",
-    "volar-service-emmet": "0.0.59",
-    "volar-service-html": "0.0.59",
-    "volar-service-prettier": "0.0.59",
-    "volar-service-typescript": "0.0.59",
-    "volar-service-typescript-twoslash-queries": "0.0.59",
-    "volar-service-yaml": "0.0.59",
+    "volar-service-css": "0.0.61",
+    "volar-service-emmet": "0.0.61",
+    "volar-service-html": "0.0.61",
+    "volar-service-prettier": "0.0.61",
+    "volar-service-typescript": "0.0.61",
+    "volar-service-typescript-twoslash-queries": "0.0.61",
+    "volar-service-yaml": "0.0.61",
     "vscode-html-languageservice": "^5.2.0",
     "vscode-uri": "^3.0.8"
   },
@@ -53,7 +53,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.4.0-alpha.15",
+    "@volar/test-utils": "~2.4.0",
     "astro": "^4.14.0",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",

diff --git a/packages/language-server/src/check.ts b/packages/language-server/src/check.ts
@@ -5,6 +5,7 @@ import { pathToFileURL } from 'node:url';
 import * as kit from '@volar/kit';
 import { Diagnostic, DiagnosticSeverity } from '@volar/language-server';
 import fg from 'fast-glob';
+import { URI } from 'vscode-uri';
 import { getAstroLanguagePlugin } from './core/index.js';
 import { getSvelteLanguagePlugin } from './core/svelte.js';
 import { getVueLanguagePlugin } from './core/vue.js';
@@ -61,13 +62,13 @@ export class AstroCheck {
 			  }
 			| undefined;
 	}): Promise<CheckResult> {
-		let files = (
-			fileNames !== undefined ? fileNames : this.linter.projectHost.getScriptFileNames()
-		).filter((file) => {
-			// We don't have the same understanding of Svelte and Vue files as their own respective tools (vue-tsc, svelte-check)
-			// So we don't want to check them here
-			return !file.endsWith('.vue') && !file.endsWith('.svelte');
-		});
+		let files = (fileNames !== undefined ? fileNames : this.linter.getRootFileNames()).filter(
+			(file) => {
+				// We don't have the same understanding of Svelte and Vue files as their own respective tools (vue-tsc, svelte-check)
+				// So we don't want to check them here
+				return !file.endsWith('.vue') && !file.endsWith('.svelte');
+			},
+		);
 
 		const result: CheckResult = {
 			status: undefined,
@@ -104,7 +105,7 @@ export class AstroCheck {
 					console.info(errorText);
 				}
 
-				const fileSnapshot = this.linter.projectHost.getScriptSnapshot(file);
+				const fileSnapshot = this.linter.language.scripts.get(URI.file(file))?.snapshot;
 				const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
 
 				result.fileResult.push({
@@ -145,7 +146,13 @@ export class AstroCheck {
 		const services = [...createTypeScriptServices(this.ts), createAstroService(this.ts)];
 
 		if (tsconfigPath) {
-			this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath);
+			const includeProjectReference = false; // #920
+			this.linter = kit.createTypeScriptChecker(
+				languagePlugins,
+				services,
+				tsconfigPath,
+				includeProjectReference,
+			);
 		} else {
 			this.linter = kit.createTypeScriptInferredChecker(languagePlugins, services, () => {
 				return fg.sync('**/*.astro', {

diff --git a/packages/language-server/src/nodeServer.ts b/packages/language-server/src/nodeServer.ts
@@ -41,7 +41,7 @@ connection.onInitialize((params) => {
 		collectionConfigs = folders.flatMap((folder) => {
 			try {
 				const folderUri = URI.parse(folder.uri);
-				let config = server.fs.readFile(
+				let config = server.fileSystem.readFile(
 					Utils.joinPath(folderUri, '.astro/collections/collections.json'),
 				);
 
@@ -76,7 +76,6 @@ connection.onInitialize((params) => {
 			};
 		}),
 		getLanguageServicePlugins(connection, typescript, collectionConfigs),
-		{ pullModelDiagnostics: params.initializationOptions?.pullModelDiagnostics },
 	);
 });
 
@@ -102,5 +101,5 @@ connection.onInitialized(() => {
 		extensions.push(...SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS);
 	}
 
-	server.watchFiles([`**/*.{${extensions.join(',')}}`]);
+	server.fileWatcher.watchFiles([`**/*.{${extensions.join(',')}}`]);
 });
diff --git a/packages/language-server/src/plugins/astro.ts b/packages/language-server/src/plugins/astro.ts
@@ -27,7 +27,10 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin =
 			completionProvider: {
 				triggerCharacters: ['-'],
 			},
-			diagnosticProvider: {},
+			diagnosticProvider: {
+				interFileDependencies: false,
+				workspaceDiagnostics: false,
+			},
 			codeLensProvider: {},
 		},
 		create(context): LanguageServicePluginInstance {
@@ -51,7 +54,7 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin =
 						items: items,
 					};
 				},
-				provideSemanticDiagnostics(document, token) {
+				provideDiagnostics(document, token) {
 					if (token.isCancellationRequested) return [];
 
 					const decoded = context.decodeEmbeddedDocumentUri(URI.parse(document.uri));

diff --git a/packages/language-server/src/plugins/typescript/index.ts b/packages/language-server/src/plugins/typescript/index.ts
@@ -56,7 +56,7 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin[]
 
 							return enhancedResolveCodeAction(resolvedCodeAction, context);
 						},
-						async provideSemanticDiagnostics(document, token) {
+						async provideDiagnostics(document, token) {
 							const decoded = context.decodeEmbeddedDocumentUri(URI.parse(document.uri));
 							const sourceScript = decoded && context.language.scripts.get(decoded[0]);
 							const root = sourceScript?.generated?.root;
@@ -70,10 +70,7 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin[]
 								tsxLineCount = root.astroMeta.tsxRanges.body.end.line;
 							}
 
-							const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics!(
-								document,
-								token,
-							);
+							const diagnostics = await typeScriptPlugin.provideDiagnostics!(document, token);
 							if (!diagnostics) return null;
 
 							return enhancedProvideSemanticDiagnostics(diagnostics, tsxLineCount);

diff --git a/packages/language-server/test/misc/init.test.ts b/packages/language-server/test/misc/init.test.ts
@@ -64,10 +64,6 @@ describe('Initialize', async () => {
 				],
 			},
 			definitionProvider: true,
-			diagnosticProvider: {
-				interFileDependencies: true,
-				workspaceDiagnostics: false,
-			},
 			documentFormattingProvider: true,
 			documentHighlightProvider: true,
 			documentLinkProvider: {},
@@ -87,7 +83,7 @@ describe('Initialize', async () => {
 					triggerCharacters: ['=', '>', '/'],
 				},
 				fileReferencesProvider: true,
-				fileRenameProvider: true,
+				fileRenameEditsProvider: true,
 			},
 			foldingRangeProvider: true,
 			hoverProvider: true,

diff --git a/packages/language-server/test/server.ts b/packages/language-server/test/server.ts
@@ -35,10 +35,14 @@ export async function getLanguageServer(): Promise<LanguageServer> {
 						'lib',
 					),
 				},
-				pullModelDiagnostics: true,
 				contentIntellisense: true,
 			},
 			{
+				textDocument: {
+					definition: {
+						linkSupport: true,
+					},
+				},
 				workspace: {
 					// Needed for tests that use didChangeWatchedFiles
 					didChangeWatchedFiles: {},

diff --git a/packages/ts-plugin/package.json b/packages/ts-plugin/package.json
@@ -30,8 +30,8 @@
     "@astrojs/compiler": "^2.10.3",
     "@astrojs/yaml2ts": "^0.2.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/language-core": "~2.4.0-alpha.15",
-    "@volar/typescript": "~2.4.0-alpha.15",
+    "@volar/language-core": "~2.4.0",
+    "@volar/typescript": "~2.4.0",
     "semver": "^7.3.8",
     "vscode-languageserver-textdocument": "^1.0.11"
   },

diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -246,8 +246,8 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
     "@types/vscode": "^1.82.0",
-    "@volar/language-server": "~2.4.0-alpha.15",
-    "@volar/vscode": "~2.4.0-alpha.15",
+    "@volar/language-server": "~2.4.0",
+    "@volar/vscode": "~2.4.0",
     "@vscode/test-electron": "^2.3.2",
     "@vscode/vsce": "2.30.0",
     "esbuild": "^0.17.19",

diff --git a/packages/yaml2ts/package.json b/packages/yaml2ts/package.json
@@ -19,7 +19,7 @@
     "yaml": "^2.5.0"
   },
   "devDependencies": {
-    "@volar/language-core": "~2.4.0-alpha.15",
+    "@volar/language-core": "~2.4.0",
     "typescript": "^5.5.4"
   }
 }