feat: format via alejandra when feature is set

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
nix-community · Jun 23, 2022 · 9189b50 · 9189b50
1 parent 2e49c1f
commit 9189b50
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,15 +24,16 @@ rnix = "0.10.2"
 rowan = "0.12.6"
 serde = "1.0.104"
 serde_json = "1.0.44"
-nixpkgs-fmt-rnix = "1.2.0"
+nixpkgs-fmt-rnix = { version = "1.2.0", optional = true }
+alejandra = { version = "1.5.0", optional = true }
 
 [dev-dependencies]
 stoppable_thread = "0.2"
 
 [features]
 
 # Set this to ["verbose"] when debugging
-default = []
+default = [ "nixpkgs-fmt-rnix" ]
 
 # Enable showing internal errors via editor UI, such as via hover popups.
 # This can be helpful for debugging, but we don't want the evaluator to

diff --git a/src/main.rs b/src/main.rs
@@ -205,16 +205,40 @@ impl App {
             let document_links = self.document_links(&params).unwrap_or_default();
             self.reply(Response::new_ok(id, document_links));
         } else if let Some((id, params)) = cast::<Formatting>(&mut req) {
-            let changes = if let Some((ast, code, _)) = self.files.get(&params.text_document.uri) {
-                let fmt = nixpkgs_fmt::reformat_node(&ast.node());
-                vec![TextEdit {
-                    range: utils::range(&code, TextRange::up_to(ast.node().text().len())),
-                    new_text: fmt.text().to_string(),
-                }]
+            if let Some((ast, code, _)) = self.files.get(&params.text_document.uri) {
+                let node = ast.node();
+                let range = utils::range(&code, TextRange::up_to(node.text().len()));
+                if cfg!(feature = "alejandra") {
+                    #[cfg(feature = "alejandra")]
+                    match alejandra::format::in_memory(
+                        params.text_document.uri.to_string(),
+                        code.to_string(),
+                    ) {
+                        (alejandra::format::Status::Changed(true), new_text) => {
+                            self.reply(Response::new_ok(id, vec![TextEdit { range, new_text }]))
+                        }
+                        (alejandra::format::Status::Changed(false), _) => {
+                            self.reply(Response::new_ok(id, ()))
+                        }
+                        (alejandra::format::Status::Error(e), _) => {
+                            self.reply(Response::new_err(id, ErrorCode::InternalError as i32, e))
+                        }
+                    }
+                } else if cfg!(feature = "nixpkgs-fmt-rnix") {
+                    #[cfg(feature = "nixpkgs-fmt-rnix")]
+                    self.reply(Response::new_ok(
+                        id,
+                        vec![TextEdit {
+                            range,
+                            new_text: nixpkgs_fmt::reformat_node(&node).text().to_string(),
+                        }],
+                    ));
+                } else {
+                    self.reply(Response::new_ok(id, ()))
+                }
             } else {
-                Vec::new()
-            };
-            self.reply(Response::new_ok(id, changes));
+                self.reply(Response::new_ok(id, ()))
+            }
         } else if let Some((id, params)) = cast::<HoverRequest>(&mut req) {
             if let Some((range, markdown)) = self.hover(params) {
                 self.reply(Response::new_ok(