fix fallback watcher

sveltejs · Oct 27, 2024 · 85bc1b5 · 85bc1b5
1 parent 156bd7d
commit 85bc1b5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/packages/language-server/src/lib/FallbackWatcher.ts b/packages/language-server/src/lib/FallbackWatcher.ts
@@ -9,6 +9,7 @@ import {
 } from 'vscode-languageserver';
 import { pathToUrl } from '../utils';
 import { fileURLToPath } from 'url';
+import { Stats } from 'fs';
 
 type DidChangeHandler = (para: DidChangeWatchedFilesParams) => void;
 
@@ -20,18 +21,20 @@ export class FallbackWatcher {
 
     private undeliveredFileEvents: FileEvent[] = [];
 
-    constructor(recursivePatterns: string, workspacePaths: string[]) {
+    constructor(watchExtensions: string[], workspacePaths: string[]) {
         const gitOrNodeModules = /\.git|node_modules/;
-        this.watcher = watch(
-            workspacePaths.map((workspacePath) => join(workspacePath, recursivePatterns)),
-            {
-                ignored: gitOrNodeModules,
-                // typescript would scan the project files on init.
-                // We only need to know what got updated.
-                ignoreInitial: true,
-                ignorePermissionErrors: true
-            }
-        );
+        const ignoredExtensions = (fileName: string, stats?: Stats) => {
+            return (
+                stats?.isFile() === true && !watchExtensions.some((ext) => fileName.endsWith(ext))
+            );
+        };
+        this.watcher = watch(workspacePaths, {
+            ignored: [gitOrNodeModules, ignoredExtensions],
+            // typescript would scan the project files on init.
+            // We only need to know what got updated.
+            ignoreInitial: true,
+            ignorePermissionErrors: true
+        });
 
         this.watcher
             .on('add', (path) => this.onFSEvent(path, FileChangeType.Created))

diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -106,7 +106,9 @@ export function startServer(options?: LSOptions) {
 
     // Include Svelte files to better deal with scenarios such as switching git branches
     // where files that are not opened in the client could change
-    const nonRecursiveWatchPattern = '*.{ts,js,mts,mjs,cjs,cts,json,svelte}';
+    const watchExtensions = ['.ts', '.js', '.mts', '.mjs', '.cjs', '.cts', '.json', '.svelte'];
+    const nonRecursiveWatchPattern =
+        '*.{' + watchExtensions.map((ext) => ext.slice(1)).join(',') + '}';
     const recursiveWatchPattern = '**/' + nonRecursiveWatchPattern;
 
     connection.onInitialize((evt) => {
@@ -120,7 +122,7 @@ export function startServer(options?: LSOptions) {
 
         if (!evt.capabilities.workspace?.didChangeWatchedFiles) {
             const workspacePaths = workspaceUris.map(urlToPath).filter(isNotNullOrUndefined);
-            watcher = new FallbackWatcher(recursiveWatchPattern, workspacePaths);
+            watcher = new FallbackWatcher(watchExtensions, workspacePaths);
             watcher.onDidChangeWatchedFiles(onDidChangeWatchedFiles);
 
             watchDirectory = (patterns) => {
@@ -338,7 +340,7 @@ export function startServer(options?: LSOptions) {
         connection?.client.register(DidChangeWatchedFilesNotification.type, {
             watchers: [
                 {
-                    // Editors have exlude configs, such as VSCode with `files.watcherExclude`,
+                    // Editors have exclude configs, such as VSCode with `files.watcherExclude`,
                     // which means it's safe to watch recursively here
                     globPattern: recursiveWatchPattern
                 }