Merge pull request #92 from posit-dev/feature/range-formatting

Add range formatting support

CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+# Development version
+
+- The LSP gains range formatting support (#63).
+
+- The `air format` command has been improved and is now able to take multiple files and directories.
+
+
+# 0.1.0
+
+- Initial release.

crates/air_r_factory/src/lib.rs

@@ -1,2 +1,3 @@
 mod generated;
-pub use crate::generated::RSyntaxFactory;
+pub use crate::generated::node_factory::*;
+pub use crate::generated::*;

crates/air_r_formatter/src/r/auxiliary/binary_expression.rs

@@ -117,6 +117,7 @@ fn fmt_binary(
     )
 }
 
+#[derive(Debug)]
 struct TailPiece {
     operator: SyntaxToken<RLanguage>,
     right: AnyRExpression,

crates/lsp/Cargo.toml

@@ -12,13 +12,15 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+air_r_factory.workspace = true
 air_r_formatter.workspace = true
 air_r_parser.workspace = true
 air_r_syntax.workspace = true
 anyhow.workspace = true
 biome_formatter.workspace = true
 biome_lsp_converters.workspace = true
 biome_parser.workspace = true
+biome_rowan.workspace = true
 biome_text_size.workspace = true
 crossbeam.workspace = true
 dissimilar.workspace = true

crates/lsp/src/documents.rs

@@ -89,6 +89,13 @@ impl Document {
         Self::new(contents.into(), None, PositionEncoding::Utf8)
     }
 
+    #[cfg(test)]
+    pub fn doodle_and_range(contents: &str) -> (Self, biome_text_size::TextRange) {
+        let (contents, range) = crate::test_utils::extract_marked_range(contents);
+        let doc = Self::new(contents, None, PositionEncoding::Utf8);
+        (doc, range)
+    }
+
     pub fn on_did_change(&mut self, mut params: lsp_types::DidChangeTextDocumentParams) {
         let new_version = params.text_document.version;
 

crates/lsp/src/handlers.rs

@@ -46,13 +46,6 @@ pub(crate) async fn handle_initialized(
         regs.append(&mut config_diagnostics_regs);
     }
 
-    // TODO! Abstract this in a method
-    regs.push(lsp_types::Registration {
-        id: String::from("air_formatting"),
-        method: String::from("textDocument/formatting"),
-        register_options: None,
-    });
-
     client
         .register_capability(regs)
         .instrument(span.exit())