fix(lsp): require config and code actions (#6557)

ematipico · arendjr · web-flow · commit fd68458f4076 · 2025-06-26T16:08:22.000+01:00
Co-authored-by: Arend van Beelen jr. &lt;arend@arendjr.nl&gt;
diff --git a/.changeset/busy-zebras-smash.md b/.changeset/busy-zebras-smash.md
@@ -0,0 +1,5 @@
+---
+"@biomejs/biome": patch
+---
+
+Fixed a bug where Biome didn't provide all the available code actions when requested by the editor.
diff --git a/.changeset/hot-dragons-count.md b/.changeset/hot-dragons-count.md
@@ -0,0 +1,6 @@
+---
+"@biomejs/biome": patch
+---
+
+Fixed [#6287](https://github.com/biomejs/biome/issues/6287) where Biome Language Server didn't adhere to the `settings.requireConfiguration` option when pulling diagnostics and code actions.
+Note that for this configuration be correctly applied, your editor must support dynamic registration capabilities.
diff --git a/crates/biome_lsp/src/capabilities.rs b/crates/biome_lsp/src/capabilities.rs
@@ -7,6 +7,24 @@ use tower_lsp_server::lsp_types::{
     WorkspaceServerCapabilities,
 };
 
+pub(crate) const DEFAULT_CODE_ACTION_CAPABILITIES: &[&str] = &[
+    "quickfix.biome",
+    // quickfix.suppressRule
+    SUPPRESSION_TOP_LEVEL_ACTION_CATEGORY,
+    SUPPRESSION_INLINE_ACTION_CATEGORY,
+    // import sorting
+    "source.organizeImports.biome",
+    // fix all
+    "source.fixAll.biome",
+    // general refactors
+    "refactor.biome",
+    "refactor.extract.biome",
+    "refactor.inline.biome",
+    "refactor.rewrite.biome",
+    // source actions
+    "source.biome",
+];
+
 /// The capabilities to send from server as part of [`InitializeResult`]
 ///
 /// [`InitializeResult`]: tower_lsp_server::lsp::InitializeResult
@@ -57,31 +75,24 @@ pub(crate) fn server_capabilities(capabilities: &ClientCapabilities) -> ServerCa
         .text_document
         .as_ref()
         .and_then(|text_document| text_document.code_action.as_ref())
-        .and_then(|code_action| code_action.code_action_literal_support.as_ref())
-        .map(|_| {
-            CodeActionOptions {
-                code_action_kinds: Some(vec![
-                    CodeActionKind::from("quickfix.biome"),
-                    // quickfix.suppressRule
-                    CodeActionKind::from(SUPPRESSION_TOP_LEVEL_ACTION_CATEGORY),
-                    CodeActionKind::from(SUPPRESSION_INLINE_ACTION_CATEGORY),
-                    // import sorting
-                    CodeActionKind::from("source.organizeImports.biome"),
-                    // fix all
-                    CodeActionKind::from("source.fixAll.biome"),
-                    // general refactors
-                    CodeActionKind::from("refactor.biome"),
-                    CodeActionKind::from("refactor.extract.biome"),
-                    CodeActionKind::from("refactor.inline.biome"),
-                    CodeActionKind::from("refactor.rewrite.biome"),
-                    // source actions
-                    CodeActionKind::from("source.biome"),
-                ]),
-                ..Default::default()
+        .and_then(|code_action| {
+            if code_action.dynamic_registration.unwrap_or(false) {
+                None
+            } else if code_action.code_action_literal_support.as_ref().is_some() {
+                Some(CodeActionProviderCapability::from(CodeActionOptions {
+                    code_action_kinds: Some(
+                        DEFAULT_CODE_ACTION_CAPABILITIES
+                            .iter()
+                            .map(|item| CodeActionKind::from(*item))
+                            .collect::<Vec<_>>(),
+                    ),
+                    ..Default::default()
+                }))
+            } else {
+                Some(CodeActionProviderCapability::Simple(true))
             }
-            .into()
-        })
-        .or(Some(CodeActionProviderCapability::Simple(true)));
+        });
+
     ServerCapabilities {
         position_encoding: Some(match negotiated_encoding(capabilities) {
             PositionEncoding::Utf8 => PositionEncodingKind::UTF8,
diff --git a/crates/biome_lsp/src/handlers/analysis.rs b/crates/biome_lsp/src/handlers/analysis.rs
@@ -8,7 +8,7 @@ use biome_analyze::{
     SUPPRESSION_TOP_LEVEL_ACTION_CATEGORY, SourceActionKind,
 };
 use biome_configuration::analyzer::RuleSelector;
-use biome_diagnostics::{Applicability, Error};
+use biome_diagnostics::Error;
 use biome_fs::BiomePath;
 use biome_lsp_converters::from_proto;
 use biome_lsp_converters::line_index::LineIndex;
@@ -96,16 +96,12 @@ pub(crate) fn code_actions(
     }
 
     let mut has_fix_all = false;
-    let mut has_quick_fix = false;
     let mut filters = Vec::new();
     if let Some(filter) = &params.context.only {
         for kind in filter {
             let kind = kind.as_str();
             if FIX_ALL_CATEGORY.matches(kind) {
                 has_fix_all = true;
-            } else if ActionCategory::QuickFix(Cow::Borrowed("")).to_str() == kind {
-                // The action is a on-save quick-fixes
-                has_quick_fix = true;
             }
             filters.push(kind);
         }
@@ -190,39 +186,31 @@ pub(crate) fn code_actions(
         .actions
         .into_iter()
         .filter_map(|action| {
-            debug!("Action: {:?}", &action.category);
-            // Don't apply unsafe fixes when the code action is on-save quick-fixes
-            if has_quick_fix && action.suggestion.applicability == Applicability::MaybeIncorrect {
-                return None;
-            }
+            debug!(
+                "Action: {:?}, and applicability {:?}",
+                &action.category, &action.suggestion.applicability
+            );
             // Filter out source.organizeImports.biome action when assist is not supported.
             if action.category.matches("source.organizeImports.biome")
                 && !file_features.supports_assist()
             {
                 return None;
             }
-            // Filter out quickfix.biome action when lint is not supported.
-            if action.category.matches("quickfix.biome") && !file_features.supports_lint() {
+            // Filter out quickfix.biome action when lint and assist aren't
+            if action.category.matches("quickfix.biome")
+                && !file_features.supports_lint()
+                && !file_features.supports_assist()
+            {
                 return None;
             }
 
-            // Filter out suppressions if the linter isn't supported
+            // Filter out suppressions if the linter and assist aren't supported
             if (action.category.matches(SUPPRESSION_INLINE_ACTION_CATEGORY)
                 || action
                     .category
                     .matches(SUPPRESSION_TOP_LEVEL_ACTION_CATEGORY))
                 && !file_features.supports_lint()
-            {
-                return None;
-            }
-
-            // Filter out the suppressions if the client is requesting a fix all signal.
-            // Fix all should apply only the safe changes.
-            if has_fix_all
-                && (action.category.matches(SUPPRESSION_INLINE_ACTION_CATEGORY)
-                    || action
-                        .category
-                        .matches(SUPPRESSION_TOP_LEVEL_ACTION_CATEGORY))
+                && !file_features.supports_assist()
             {
                 return None;
             }
@@ -280,7 +268,7 @@ pub(crate) fn code_actions(
     Ok(Some(actions))
 }
 
-/// Generate a "fix all" code action for the given document
+/// Generate the code action `source.fixAll.biome` for the current document
 #[tracing::instrument(level = "debug", skip(session, url))]
 fn fix_all(
     session: &Session,
@@ -293,7 +281,7 @@ fn fix_all(
     let Some(doc) = session.document(url) else {
         return Ok(None);
     };
-    let features = FeaturesBuilder::new().with_linter().with_assist().build();
+    let analyzer_features = FeaturesBuilder::new().with_linter().with_assist().build();
 
     if !session.workspace.file_exists(path.clone().into())? {
         return Ok(None);
@@ -302,7 +290,7 @@ fn fix_all(
     if session.workspace.is_path_ignored(IsPathIgnoredParams {
         path: path.clone(),
         project_key: doc.project_key,
-        features,
+        features: analyzer_features,
     })? {
         return Ok(None);
     }
@@ -318,11 +306,10 @@ fn fix_all(
     })?;
     let should_format = file_features.supports_format();
 
-    let features = FeaturesBuilder::new().with_linter().with_assist().build();
     if session.workspace.is_path_ignored(IsPathIgnoredParams {
         path: path.clone(),
         project_key: doc.project_key,
-        features,
+        features: analyzer_features,
     })? {
         return Ok(None);
     }
@@ -424,7 +411,7 @@ fn fix_all(
     };
 
     Ok(Some(CodeActionOrCommand::CodeAction(lsp::CodeAction {
-        title: String::from("Fix all auto-fixable issues"),
+        title: String::from("Apply all safe fixes (Biome)"),
         kind: Some(fix_all_kind()),
         diagnostics: Some(diagnostics),
         edit: Some(edit),
diff --git a/crates/biome_lsp/src/server.rs b/crates/biome_lsp/src/server.rs
@@ -1,4 +1,4 @@
-use crate::capabilities::server_capabilities;
+use crate::capabilities::{DEFAULT_CODE_ACTION_CAPABILITIES, server_capabilities};
 use crate::diagnostics::{LspError, handle_lsp_error};
 use crate::requests::syntax_tree::{SYNTAX_TREE_REQUEST, SyntaxTreePayload};
 use crate::session::{
@@ -30,7 +30,7 @@ use tokio::task::spawn_blocking;
 use tower_lsp_server::jsonrpc::Result as LspResult;
 use tower_lsp_server::{ClientSocket, UriExt, lsp_types::*};
 use tower_lsp_server::{LanguageServer, LspService, Server};
-use tracing::{error, info, instrument, warn};
+use tracing::{debug, error, info, instrument, warn};
 
 pub struct LSPServer {
     pub(crate) session: SessionHandle,
@@ -222,6 +222,28 @@ impl LSPServer {
             },
         );
 
+        let f = self.session.is_linting_and_formatting_disabled();
+        debug!("Requires configuration: {f}");
+        capabilities.add_capability(
+            "biome_code_action",
+            "textDocument/codeAction",
+            if self.session.is_linting_and_formatting_disabled() {
+                CapabilityStatus::Disable
+            } else {
+                CapabilityStatus::Enable(Some(json!(CodeActionProviderCapability::from(
+                    CodeActionOptions {
+                        code_action_kinds: Some(
+                            DEFAULT_CODE_ACTION_CAPABILITIES
+                                .iter()
+                                .map(|item| CodeActionKind::from(*item))
+                                .collect::<Vec<_>>(),
+                        ),
+                        ..Default::default()
+                    }
+                ))))
+            },
+        );
+
         self.session.register_capabilities(capabilities).await;
     }
 
diff --git a/crates/biome_lsp/src/server.tests.rs b/crates/biome_lsp/src/server.tests.rs
@@ -1385,88 +1385,6 @@ async fn pull_quick_fixes() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test]
-async fn pull_biome_quick_fixes_ignore_unsafe() -> Result<()> {
-    let factory = ServerFactory::default();
-    let (service, client) = factory.create().into_inner();
-    let (stream, sink) = client.split();
-    let mut server = Server::new(service);
-
-    let unsafe_fixable = Diagnostic {
-        range: Range {
-            start: Position {
-                line: 0,
-                character: 6,
-            },
-            end: Position {
-                line: 0,
-                character: 9,
-            },
-        },
-        severity: Some(DiagnosticSeverity::ERROR),
-        code: Some(NumberOrString::String(String::from(
-            "lint/suspicious/noDoubleEquals",
-        ))),
-        code_description: None,
-        source: Some(String::from("biome")),
-        message: String::from("Use === instead of ==."),
-        related_information: None,
-        tags: None,
-        data: None,
-    };
-
-    let (sender, _) = channel(CHANNEL_BUFFER_SIZE);
-    let reader = tokio::spawn(client_handler(stream, sink, sender));
-
-    server.initialize().await?;
-    server.initialized().await?;
-
-    server.open_document("if(a == 0) {}").await?;
-
-    let res: CodeActionResponse = server
-        .request(
-            "textDocument/codeAction",
-            "pull_code_actions",
-            CodeActionParams {
-                text_document: TextDocumentIdentifier {
-                    uri: uri!("document.js"),
-                },
-                range: Range {
-                    start: Position {
-                        line: 0,
-                        character: 6,
-                    },
-                    end: Position {
-                        line: 0,
-                        character: 6,
-                    },
-                },
-                context: CodeActionContext {
-                    diagnostics: vec![unsafe_fixable.clone()],
-                    only: Some(vec![CodeActionKind::new("quickfix.biome")]),
-                    ..Default::default()
-                },
-                work_done_progress_params: WorkDoneProgressParams {
-                    work_done_token: None,
-                },
-                partial_result_params: PartialResultParams {
-                    partial_result_token: None,
-                },
-            },
-        )
-        .await?
-        .context("codeAction returned None")?;
-
-    assert_eq!(res, vec![]);
-
-    server.close_document().await?;
-
-    server.shutdown().await?;
-    reader.abort();
-
-    Ok(())
-}
-
 #[tokio::test]
 async fn pull_biome_quick_fixes() -> Result<()> {
     let factory = ServerFactory::default();
@@ -1621,7 +1539,12 @@ async fn pull_quick_fixes_include_unsafe() -> Result<()> {
                 },
                 context: CodeActionContext {
                     diagnostics: vec![unsafe_fixable.clone()],
-                    only: Some(vec![]),
+                    only: Some(
+                        DEFAULT_CODE_ACTION_CAPABILITIES
+                            .iter()
+                            .map(|s| CodeActionKind::from(*s))
+                            .collect::<Vec<_>>(),
+                    ),
                     ..Default::default()
                 },
                 work_done_progress_params: WorkDoneProgressParams {
@@ -2565,7 +2488,7 @@ async fn pull_fix_all() -> Result<()> {
     );
 
     let expected_action = CodeActionOrCommand::CodeAction(CodeAction {
-        title: String::from("Fix all auto-fixable issues"),
+        title: String::from("Apply all safe fixes (Biome)"),
         kind: Some(CodeActionKind::new("source.fixAll.biome")),
         diagnostics: Some(vec![
             fixable_diagnostic(0)?,
diff --git a/crates/biome_lsp/src/session.rs b/crates/biome_lsp/src/session.rs
diff --git a/crates/biome_service/src/projects.rs b/crates/biome_service/src/projects.rs

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@biomejs/biome": patch
 +---
++
 +Fixed a bug where Biome didn't provide all the available code actions when requested by the editor.