refactor: register file watchers in language server

close #2037
vuejs · Oct 23, 2022 · 3c07cd2 · 3c07cd2
1 parent 158ec1f
commit 3c07cd2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/extensions/vscode-vue-language-features/src/browserClientMain.ts b/extensions/vscode-vue-language-features/src/browserClientMain.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/browser';
-import { activate as commonActivate, deactivate as commonDeactivate, processHtml, processMd } from './common';
+import { activate as commonActivate, deactivate as commonDeactivate } from './common';
 import { middleware } from './middleware';
 
 export function activate(context: vscode.ExtensionContext) {
@@ -24,9 +24,6 @@ export function activate(context: vscode.ExtensionContext) {
 			documentSelector: langs.map<lsp.DocumentFilter>(lang => ({ language: lang })),
 			initializationOptions: initOptions,
 			progressOnInitialization: true,
-			synchronize: {
-				fileEvents: vscode.workspace.createFileSystemWatcher(`{**/*.vue,${processMd() ? '**/*.md,' : ''}${processHtml() ? '**/*.html,' : ''}**/*.js,**/*.ts,**/*.cjs,**/*.cts,**/*.mjs,**/*.mts,**/*.jsx,**/*.tsx,**/*.json}`)
-			},
 			middleware,
 		};
 		const client = new _LanguageClient(

diff --git a/extensions/vscode-vue-language-features/src/nodeClientMain.ts b/extensions/vscode-vue-language-features/src/nodeClientMain.ts
@@ -4,7 +4,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/node';
-import { activate as commonActivate, deactivate as commonDeactivate, getDocumentSelector, processHtml, processMd } from './common';
+import { activate as commonActivate, deactivate as commonDeactivate, getDocumentSelector } from './common';
 import { middleware } from './middleware';
 
 export function activate(context: vscode.ExtensionContext) {
@@ -42,7 +42,6 @@ export function activate(context: vscode.ExtensionContext) {
 			}
 		}
 
-		const additionalExtensions = initOptions.additionalExtensions?.map(ext => `,**/*.${ext}`).join('') ?? '';
 		const serverModule = vscode.Uri.joinPath(context.extensionUri, 'server.js');
 		const maxOldSpaceSize = vscode.workspace.getConfiguration('volar').get<number | null>('vueserver.maxOldSpaceSize');
 		const runOptions = { execArgv: <string[]>[] };
@@ -67,9 +66,6 @@ export function activate(context: vscode.ExtensionContext) {
 			documentSelector: langs.map<lsp.DocumentFilter>(lang => ({ language: lang })),
 			initializationOptions: initOptions,
 			progressOnInitialization: true,
-			synchronize: {
-				fileEvents: vscode.workspace.createFileSystemWatcher(`{**/*.vue,${processMd() ? '**/*.md,' : ''}${processHtml() ? '**/*.html,' : ''}**/*.js,**/*.ts,**/*.cjs,**/*.cts,**/*.mjs,**/*.mts,**/*.jsx,**/*.tsx,**/*.json${additionalExtensions}}`)
-			},
 		};
 		const client = new _LanguageClient(
 			id,

diff --git a/packages/language-server/src/registerFeatures.ts b/packages/language-server/src/registerFeatures.ts
@@ -114,7 +114,11 @@ export function setupSemanticCapabilities(
 					filters: [
 						...plugins.map(plugin => plugin.extraFileExtensions.map(ext => ({ pattern: { glob: `**/*.${ext.extension}` } }))).flat(),
 						{ pattern: { glob: '**/*.js' } },
+						{ pattern: { glob: '**/*.cjs' } },
+						{ pattern: { glob: '**/*.mjs' } },
 						{ pattern: { glob: '**/*.ts' } },
+						{ pattern: { glob: '**/*.cts' } },
+						{ pattern: { glob: '**/*.mts' } },
 						{ pattern: { glob: '**/*.jsx' } },
 						{ pattern: { glob: '**/*.tsx' } },
 						{ pattern: { glob: '**/*.json' } },

diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -89,6 +89,23 @@ export function createCommonLanguageServer(
 				}
 			});
 		}
+
+		if (params.capabilities.workspace?.didChangeWatchedFiles?.dynamicRegistration) {
+			connection.client.register(vscode.DidChangeWatchedFilesNotification.type, {
+				watchers: [
+					...plugins.map(plugin => plugin.extraFileExtensions.map(ext => ({ globPattern: `**/*.${ext.extension}` }))).flat(),
+					{ globPattern: '**/*.js' },
+					{ globPattern: '**/*.cjs' },
+					{ globPattern: '**/*.mjs' },
+					{ globPattern: '**/*.ts' },
+					{ globPattern: '**/*.cts' },
+					{ globPattern: '**/*.mts' },
+					{ globPattern: '**/*.jsx' },
+					{ globPattern: '**/*.tsx' },
+					{ globPattern: '**/*.json' },
+				]
+			});
+		}
 	});
 	connection.listen();