Inspect configuration's client capability

crates/lsp/src/capabilities.rs

@@ -8,16 +8,17 @@
 use tower_lsp::lsp_types::ClientCapabilities;
 use tower_lsp::lsp_types::PositionEncodingKind;
 
-/// A resolved representation of the [ClientCapabilities] the Client sends over that we
-/// actually do something with
+/// The subset of [ClientCapabilities] the Client sends over that we actually do
+/// something with
 #[derive(Debug, Default)]
-pub(crate) struct ResolvedClientCapabilities {
+pub(crate) struct AirClientCapabilities {
     pub(crate) position_encodings: Vec<PositionEncodingKind>,
     pub(crate) dynamic_registration_for_did_change_configuration: bool,
     pub(crate) dynamic_registration_for_did_change_watched_files: bool,
+    pub(crate) request_configuration: bool,
 }
 
-impl ResolvedClientCapabilities {
+impl AirClientCapabilities {
     pub(crate) fn new(capabilities: ClientCapabilities) -> Self {
         let position_encodings = capabilities
             .general
@@ -38,10 +39,17 @@ impl ResolvedClientCapabilities {
             .and_then(|watched_files| watched_files.dynamic_registration)
             .unwrap_or_default();
 
+        let configuration = capabilities
+            .workspace
+            .as_ref()
+            .and_then(|workspace| workspace.configuration)
+            .unwrap_or_default();
+
         Self {
             position_encodings,
             dynamic_registration_for_did_change_configuration,
             dynamic_registration_for_did_change_watched_files,
+            request_configuration: configuration,
         }
     }
 }

crates/lsp/src/handlers_state.rs

@@ -34,7 +34,7 @@ use tower_lsp::lsp_types::WorkspaceServerCapabilities;
 use tracing::Instrument;
 use url::Url;
 
-use crate::capabilities::ResolvedClientCapabilities;
+use crate::capabilities::AirClientCapabilities;
 use crate::documents::Document;
 use crate::logging;
 use crate::logging::LogMessageSender;
@@ -95,7 +95,7 @@ pub(crate) fn initialize(
         params.workspace_folders.unwrap_or_default(),
     );
 
-    lsp_state.capabilities = ResolvedClientCapabilities::new(params.capabilities);
+    lsp_state.capabilities = AirClientCapabilities::new(params.capabilities);
 
     // If the client supports UTF-8 we use that, even if it's not its
     // preferred encoding (at position 0). Otherwise we use the mandatory
@@ -154,7 +154,7 @@ pub(crate) async fn did_open(
 
     // TODO: Remove once the test client knows about the `configuration`
     // server-to-client request
-    if !cfg!(test) {
+    if lsp_state.capabilities.request_configuration {
         update_config(vec![uri], client, lsp_state, state)
             .instrument(tracing::info_span!("did_change_configuration"))
             .await?;
@@ -365,7 +365,7 @@ fn update_diagnostics_config(
 }
 
 fn update_documents_config(
-    keys: IntoIter<&str, 4>,
+    keys: IntoIter<&str, 3>,
     mut items: impl Iterator<Item = Value>,
     uris: Vec<Url>,
     state: &mut WorldState,

crates/lsp/src/main_loop.rs

@@ -20,7 +20,7 @@ use tower_lsp::Client;
 use url::Url;
 use workspace::settings::Settings;
 
-use crate::capabilities::ResolvedClientCapabilities;
+use crate::capabilities::AirClientCapabilities;
 use crate::handlers;
 use crate::handlers_ext;
 use crate::handlers_format;
@@ -166,7 +166,7 @@ pub(crate) struct LspState {
     pub(crate) parsers: HashMap<Url, tree_sitter::Parser>,
 
     /// List of client capabilities that we care about
-    pub(crate) capabilities: ResolvedClientCapabilities,
+    pub(crate) capabilities: AirClientCapabilities,
 
     /// State used to dynamically update the log level
     pub(crate) log_state: Option<logging::LogState>,
@@ -179,7 +179,7 @@ impl Default for LspState {
             // Default encoding specified in the LSP protocol
             position_encoding: PositionEncoding::Wide(WideEncoding::Utf16),
             parsers: Default::default(),
-            capabilities: ResolvedClientCapabilities::default(),
+            capabilities: AirClientCapabilities::default(),
             log_state: None,
         }
     }