format code

Author: coder3101

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "protols"
 description = "Language server for proto3 files"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/coder3101/protols"

Cargo.toml

@@ -70,7 +70,7 @@ impl ClangFormatter {
         Self {
             temp_dir: tempdir().expect("faile to creat temp dir"),
             path: cmd.to_owned(),
-            working_dir: wdir.to_owned()
+            working_dir: wdir.to_owned(),
         }
     }
 
@@ -85,7 +85,10 @@ impl ClangFormatter {
         let mut c = Command::new(self.path.as_str());
         c.current_dir(self.working_dir.as_str());
         c.stdin(File::open(u).ok()?);
-        c.args(["--output-replacements-xml", format!("--assume-filename={f}").as_str()]);
+        c.args([
+            "--output-replacements-xml",
+            format!("--assume-filename={f}").as_str(),
+        ]);
         Some(c)
     }
 
@@ -116,7 +119,12 @@ impl ProtoFormatter for ClangFormatter {
         self.output_to_textedit(&String::from_utf8_lossy(&output.stdout), content)
     }
 
-    fn format_document_range(&self, r: &Range, filename: &str, content: &str) -> Option<Vec<TextEdit>> {
+    fn format_document_range(
+        &self,
+        r: &Range,
+        filename: &str,
+        content: &str,
+    ) -> Option<Vec<TextEdit>> {
         let p = self.get_temp_file_path(content)?;
         let start = r.start.line + 1;
         let end = r.end.line + 1;

src/formatter/clang.rs

@@ -4,5 +4,10 @@ pub mod clang;
 
 pub trait ProtoFormatter: Sized {
     fn format_document(&self, filename: &str, content: &str) -> Option<Vec<TextEdit>>;
-    fn format_document_range(&self, r: &Range, filename: &str, content: &str) -> Option<Vec<TextEdit>>;
+    fn format_document_range(
+        &self,
+        r: &Range,
+        filename: &str,
+        content: &str,
+    ) -> Option<Vec<TextEdit>>;
 }

src/formatter/mod.rs

@@ -9,6 +9,7 @@ use server::{ProtoLanguageServer, TickEvent};
 use tower::ServiceBuilder;
 use tracing::Level;
 
+mod config;
 mod formatter;
 mod lsp;
 mod nodekind;
@@ -17,7 +18,6 @@ mod server;
 mod state;
 mod utils;
 mod workspace;
-mod config;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() {

src/main.rs

@@ -99,7 +99,7 @@ mod test {
         let b = include_str!("input/b.proto");
         let c = include_str!("input/c.proto");
 
-        let mut state: ProtoLanguageState<ClangFormatter> = ProtoLanguageState::new();
+        let mut state: ProtoLanguageState = ProtoLanguageState::new();
         state.upsert_file(&a_uri, a.to_owned());
         state.upsert_file(&b_uri, b.to_owned());
         state.upsert_file(&c_uri, c.to_owned());