fix(language_server): on configuration change, send updated diagnostics to the client (#10764)

Sysix · Sysix · commit eb3f37c34fea · 2025-05-03T09:11:30.000Z
diff --git a/crates/oxc_language_server/src/main.rs b/crates/oxc_language_server/src/main.rs
@@ -121,12 +121,21 @@ impl LanguageServer for Backend {
 
     async fn did_change_configuration(&self, params: DidChangeConfigurationParams) {
         let workers = self.workspace_workers.lock().await;
+        let new_diagnostics: papaya::HashMap<String, Vec<Diagnostic>, FxBuildHasher> =
+            ConcurrentHashMap::default();
 
         // when we have only workspace folder, apply to it
         // ToDo: check if this is really safe because the client could still pass an empty settings
         if workers.len() == 1 {
             let worker = workers.first().unwrap();
-            worker.did_change_configuration(params.settings).await;
+            let Some(diagnostics) = worker.did_change_configuration(params.settings).await else {
+                return;
+            };
+            for (uri, reports) in &diagnostics.pin() {
+                new_diagnostics
+                    .pin()
+                    .insert(uri.clone(), reports.iter().map(|d| d.diagnostic.clone()).collect());
+            }
 
         // else check if the client support workspace configuration requests so we can only restart only the needed workers
         } else if self
@@ -156,16 +165,49 @@ impl LanguageServer for Backend {
             // this is a LSP specification and errors should be reported on the client side
             for (index, worker) in workers.iter().enumerate() {
                 let config = &configs[index];
-                worker.did_change_configuration(config.clone()).await;
+                let Some(diagnostics) = worker.did_change_configuration(config.clone()).await
+                else {
+                    continue;
+                };
+
+                for (uri, reports) in &diagnostics.pin() {
+                    new_diagnostics.pin().insert(
+                        uri.clone(),
+                        reports.iter().map(|d| d.diagnostic.clone()).collect(),
+                    );
+                }
             }
 
             // we have multiple workspace folders and the client does not support workspace configuration requests
             // we assume that every workspace is under effect
         } else {
             for worker in workers.iter() {
-                worker.did_change_configuration(params.settings.clone()).await;
+                let Some(diagnostics) =
+                    worker.did_change_configuration(params.settings.clone()).await
+                else {
+                    continue;
+                };
+
+                for (uri, reports) in &diagnostics.pin() {
+                    new_diagnostics.pin().insert(
+                        uri.clone(),
+                        reports.iter().map(|d| d.diagnostic.clone()).collect(),
+                    );
+                }
             }
         }
+
+        if new_diagnostics.is_empty() {
+            return;
+        }
+
+        let x = &new_diagnostics
+            .pin()
+            .into_iter()
+            .map(|(key, value)| (key.clone(), value.clone()))
+            .collect::<Vec<_>>();
+
+        self.publish_all_diagnostics(x).await;
     }
 
     async fn did_change_watched_files(&self, params: DidChangeWatchedFilesParams) {
diff --git a/editors/vscode/client/extension.spec.ts b/editors/vscode/client/extension.spec.ts
@@ -28,6 +28,11 @@ setup(async () => {
   await activateExtension();
 });
 
+teardown(async () => {
+  await workspace.getConfiguration('oxc').update('flags', undefined);
+  await workspace.saveAll();
+});
+
 suite('commands', () => {
   test('listed commands', async () => {
     const oxcCommands = (await commands.getCommands(true)).filter(x => x.startsWith('oxc.'));
@@ -162,6 +167,46 @@ suite('code actions', () => {
     await workspace.getConfiguration('editor').update('codeActionsOnSave', undefined);
     await workspace.saveAll();
   });
+
+  test('changing configuration "fix_kind" will reveal more code actions', async () => {
+    await loadFixture('changing_fix_kind');
+    const fileUri = Uri.joinPath(WORKSPACE_DIR, 'fixtures', 'for_direction.ts');
+    await window.showTextDocument(fileUri);
+    const codeActionsNoFix: ProviderResult<Array<CodeAction>> = await commands.executeCommand(
+      'vscode.executeCodeActionProvider',
+      fileUri,
+      {
+        start: { line: 0, character: 18 },
+        end: { line: 0, character: 19 },
+      },
+    );
+
+    assert(Array.isArray(codeActionsNoFix));
+    const quickFixesNoFix = codeActionsNoFix.filter(
+      (action) => action.kind?.value === 'quickfix',
+    );
+    strictEqual(quickFixesNoFix.length, 2);
+
+    await workspace.getConfiguration('oxc').update('flags', {
+      'fix_kind': 'dangerous_fix',
+    });
+    await workspace.saveAll();
+
+    const codeActionsWithFix: ProviderResult<Array<CodeAction>> = await commands.executeCommand(
+      'vscode.executeCodeActionProvider',
+      fileUri,
+      {
+        start: { line: 0, character: 18 },
+        end: { line: 0, character: 19 },
+      },
+    );
+
+    assert(Array.isArray(codeActionsWithFix));
+    const quickFixesWithFix = codeActionsWithFix.filter(
+      (action) => action.kind?.value === 'quickfix',
+    );
+    strictEqual(quickFixesWithFix.length, 3);
+  });
 });
 
 suite('E2E Diagnostics', () => {
diff --git a/editors/vscode/fixtures/changing_fix_kind/for_direction.ts b/editors/vscode/fixtures/changing_fix_kind/for_direction.ts
@@ -0,0 +1 @@
+for(var i = 0; i < 10; i--){}
