Merge branch 'main' into FoldingRange

Author: kv9898

.zed/settings.json

@@ -0,0 +1,18 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "lsp": {
+    "rust-analyzer": {
+      "initialization_options": {
+        "checkOnSave": {
+          "command": "clippy"
+        },
+        "rustfmt": {
+          "extraArgs": ["+nightly"]
+        }
+      }
+    }
+  }
+}

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 # Development version
 
+
+# 0.1.2
+
 - The default indent style has been changed to spaces. The default indent width
   has been changed to two. This more closely matches the overwhelming majority
   of existing R code.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "air"
-version = "0.1.1"
+version = "0.1.2"
 publish = true
 authors.workspace = true
 categories.workspace = true

crates/air/Cargo.toml

@@ -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/capabilities.rs

@@ -9,9 +9,9 @@ use biome_lsp_converters::{line_index, PositionEncoding};
 use settings::LineEnding;
 use tower_lsp::lsp_types;
 
-use crate::config::DocumentConfig;
 use crate::rust_analyzer::line_index::LineIndex;
 use crate::rust_analyzer::utils::apply_document_changes;
+use crate::settings::DocumentSettings;
 
 #[derive(Clone)]
 pub struct Document {
@@ -34,8 +34,8 @@ pub struct Document {
     /// None if the document hasn't been synchronized yet.
     pub version: Option<i32>,
 
-    /// Configuration of the document, such as indentation settings.
-    pub config: DocumentConfig,
+    /// Settings of the document, such as indentation settings.
+    pub settings: DocumentSettings,
 }
 
 impl std::fmt::Debug for Document {
@@ -80,7 +80,7 @@ impl Document {
             line_index,
             parse,
             version,
-            config: Default::default(),
+            settings: Default::default(),
         }
     }
 

crates/lsp/src/config.rs

@@ -21,6 +21,10 @@ use crate::config::VscLogConfig;
 use crate::main_loop::LspState;
 use crate::state::WorldState;
 
+use crate::settings_vsc::VscDiagnosticsSettings;
+use crate::settings_vsc::VscDocumentSettings;
+use crate::settings_vsc::VscLogSettings;
+
 // Handlers that do not mutate the world state. They take a sharing reference or
 // a clone of the state.
 
@@ -44,16 +48,16 @@ pub(crate) async fn handle_initialized(
         // changed by extensions or by the user without changing the actual
         // underlying setting. Unfortunately we don't receive updates in that case.
         let mut config_document_registrations = collect_regs(
-            VscDocumentConfig::FIELD_NAMES_AS_ARRAY.to_vec(),
-            VscDocumentConfig::section_from_key,
+            VscDocumentSettings::FIELD_NAMES_AS_ARRAY.to_vec(),
+            VscDocumentSettings::section_from_key,
         );
-        let mut config_diagnostics_registrations: Vec<lsp_types::Registration> = collect_regs(
-            VscDiagnosticsConfig::FIELD_NAMES_AS_ARRAY.to_vec(),
-            VscDiagnosticsConfig::section_from_key,
+        let mut config_diagnostics_registrations = collect_regs(
+            VscDiagnosticsSettings::FIELD_NAMES_AS_ARRAY.to_vec(),
+            VscDiagnosticsSettings::section_from_key,
         );
-        let mut config_log_registrations: Vec<lsp_types::Registration> = collect_regs(
-            VscLogConfig::FIELD_NAMES_AS_ARRAY.to_vec(),
-            VscLogConfig::section_from_key,
+        let mut config_log_registrations = collect_regs(
+            VscLogSettings::FIELD_NAMES_AS_ARRAY.to_vec(),
+            VscLogSettings::section_from_key,
         );
 
         registrations.append(&mut config_document_registrations);

crates/lsp/src/documents.rs

@@ -23,7 +23,7 @@ pub(crate) fn document_formatting(
 ) -> anyhow::Result<Option<Vec<lsp_types::TextEdit>>> {
     let doc = state.get_document(&params.text_document.uri)?;
 
-    let settings = lsp_state.document_settings(&params.text_document.uri);
+    let settings = lsp_state.document_settings(&params.text_document.uri, &doc.settings);
     let format_options = settings.format.to_format_options(&doc.contents);
 
     if doc.parse.has_errors() {
@@ -68,7 +68,7 @@ pub(crate) fn document_range_formatting(
     let range =
         from_proto::text_range(&doc.line_index.index, params.range, doc.line_index.encoding)?;
 
-    let settings = lsp_state.document_settings(&params.text_document.uri);
+    let settings = lsp_state.document_settings(&params.text_document.uri, &doc.settings);
     let format_options = settings.format.to_format_options(&doc.contents);
 
     let logical_lines = find_deepest_enclosing_logical_lines(doc.parse.syntax(), range);
@@ -521,4 +521,40 @@ mod tests {
             insta::assert_snapshot!(output6);
         });
     }
+
+    #[test]
+    fn test_format_indent_options() {
+        with_client(|client| async {
+            let mut client = client.lock().await;
+
+            #[rustfmt::skip]
+            let mut doc = Document::doodle("{1}");
+
+            doc.settings.indent_width = Some(settings::IndentWidth::try_from(8_u8).unwrap());
+            let output_8_spaces = client.format_document(&doc).await;
+            insta::assert_snapshot!(output_8_spaces);
+
+            doc.settings.indent_style = Some(settings::IndentStyle::Tab);
+            let output_tab = client.format_document(&doc).await;
+            insta::assert_snapshot!(output_tab);
+        });
+    }
+
+    #[test]
+    fn test_format_range_indent_options() {
+        with_client(|client| async {
+            let mut client = client.lock().await;
+
+            #[rustfmt::skip]
+            let (mut doc, range) = Document::doodle_and_range("<<{1}>>");
+
+            doc.settings.indent_width = Some(settings::IndentWidth::try_from(8_u8).unwrap());
+            let output_8_spaces = client.format_document_range(&doc, range).await;
+            insta::assert_snapshot!(output_8_spaces);
+
+            doc.settings.indent_style = Some(settings::IndentStyle::Tab);
+            let output_tab = client.format_document_range(&doc, range).await;
+            insta::assert_snapshot!(output_tab);
+        });
+    }
 }