feat(editor): Only watch .oxlintrc.json or user supplied config paths (#9731)

This works by detecting if the user changes the config setting and
restarting the language client to pick up the new watchers.

Author: nrayburn-tech

editors/vscode/client/Config.ts

@@ -1,5 +1,7 @@
 import { workspace } from 'vscode';
 
+export const oxlintConfigFileName = '.oxlintrc.json';
+
 export class Config implements ConfigInterface {
   private static readonly _namespace = 'oxc';
 
@@ -19,7 +21,7 @@ export class Config implements ConfigInterface {
     this._runTrigger = conf.get<Trigger>('lint.run') || 'onType';
     this._enable = conf.get<boolean>('enable') ?? true;
     this._trace = conf.get<TraceLevel>('trace.server') || 'off';
-    this._configPath = conf.get<string>('configPath') || '.oxlintrc.json';
+    this._configPath = conf.get<string>('configPath') || oxlintConfigFileName;
     this._binPath = conf.get<string>('path.server');
   }
 

editors/vscode/client/extension.ts

@@ -1,12 +1,22 @@
 import { promises as fsPromises } from 'node:fs';
 
-import { commands, ExtensionContext, StatusBarAlignment, StatusBarItem, ThemeColor, window, workspace } from 'vscode';
+import {
+  commands,
+  ExtensionContext,
+  RelativePattern,
+  StatusBarAlignment,
+  StatusBarItem,
+  ThemeColor,
+  window,
+  workspace,
+} from 'vscode';
 
 import { ExecuteCommandRequest, MessageType, ShowMessageNotification } from 'vscode-languageclient';
 
 import { Executable, LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient/node';
 
 import { join } from 'node:path';
+import { oxlintConfigFileName } from './Config';
 import { ConfigService } from './ConfigService';
 
 const languageClientName = 'oxc';
@@ -170,10 +180,7 @@ export async function activate(context: ExtensionContext) {
     })),
     synchronize: {
       // Notify the server about file config changes in the workspace
-      fileEvents: [
-        workspace.createFileSystemWatcher('**/.oxlint{.json,rc.json}'),
-        workspace.createFileSystemWatcher('**/oxlint{.json,rc.json}'),
-      ],
+      fileEvents: createFileEventWatchers(configService.config.configPath),
     },
     initializationOptions: {
       settings: configService.config.toLanguageServerConfig(),
@@ -216,10 +223,16 @@ export async function activate(context: ExtensionContext) {
     });
   });
 
-  configService.onConfigChange = function onConfigChange() {
+  configService.onConfigChange = function onConfigChange(event) {
     let settings = this.config.toLanguageServerConfig();
     updateStatsBar(settings.enable);
     client.sendNotification('workspace/didChangeConfiguration', { settings });
+
+    if (event.affectsConfiguration('oxc.configPath')) {
+      client.clientOptions.synchronize = client.clientOptions.synchronize ?? {};
+      client.clientOptions.synchronize.fileEvents = createFileEventWatchers(configService.config.configPath);
+      client.restart();
+    }
   };
 
   function updateStatsBar(enable: boolean) {
@@ -251,3 +264,16 @@ export function deactivate(): Thenable<void> | undefined {
   }
   return client.stop();
 }
+
+function createFileEventWatchers(configRelativePath: string) {
+  const workspaceConfigPatterns = (workspace.workspaceFolders || []).map((workspaceFolder) =>
+    new RelativePattern(workspaceFolder, configRelativePath)
+  );
+
+  return [
+    workspace.createFileSystemWatcher(`**/${oxlintConfigFileName}`),
+    ...workspaceConfigPatterns.map((pattern) => {
+      return workspace.createFileSystemWatcher(pattern);
+    }),
+  ];
+}