chore: bump dependencies and release 0.12.8 with if chaining (#87)

Author: asharkhan3101

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "protols"
 description = "Language server for proto3 files"
-version = "0.12.7"
+version = "0.12.8"
 edition = "2024"
 license = "MIT"
 homepage = "https://github.com/coder3101/protols"
@@ -12,23 +12,23 @@ keywords = ["lsp", "proto"]
 exclude = ["assets/*", "sample/*"]
 
 [dependencies]
-async-lsp = { version = "0.2.2", features = ["tokio"] }
-futures = "0.3.31"
-tokio = { version = "1.38.0", features = ["time", "full"] }
-tokio-util = { version = "0.7.11", features = ["compat"] }
-tower = "0.5.2"
-tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
-tree-sitter = "0.25.2"
-tracing-appender = "0.2.3"
-tree-sitter-proto = "0.2.0"
-walkdir = "2.5.0"
-hard-xml = "1.36.0"
-tempfile = "3.12.0"
-serde = { version = "1.0.209", features = ["derive"] }
-basic-toml = "0.1.9"
-pkg-config = "0.3.31"
-clap = { version = "4.5.5", features = ["derive"] }
+async-lsp = { version = "0.2", features = ["tokio"] }
+futures = "0.3"
+tokio = { version = "1.47", features = ["time", "full"] }
+tokio-util = { version = "0.7", features = ["compat"] }
+tower = "0.5"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+tree-sitter = "0.25"
+tracing-appender = "0.2"
+tree-sitter-proto = "0.3"
+walkdir = "2.5"
+hard-xml = "1.41"
+tempfile = "3.21"
+serde = { version = "1", features = ["derive"] }
+basic-toml = "0.1"
+pkg-config = "0.3"
+clap = { version = "4.5", features = ["derive"] }
 
 [dev-dependencies]
-insta = { version = "1.39.0", features = ["yaml"] }
+insta = { version = "1.43", features = ["yaml"] }

Cargo.toml

@@ -120,10 +120,10 @@ impl WorkspaceProtoConfigs {
         let wr = ProtolsConfig::default();
         let rp = if cfg!(target_os = "windows") {
             let mut d = String::from("C");
-            if let Ok(cdir) = env::current_dir() {
-                if let Some(drive) = cdir.components().next() {
-                    d = drive.as_os_str().to_string_lossy().to_string()
-                }
+            if let Ok(cdir) = env::current_dir()
+                && let Some(drive) = cdir.components().next()
+            {
+                d = drive.as_os_str().to_string_lossy().to_string()
             }
             format!("{d}://")
         } else {

src/config/workspace.rs

@@ -415,10 +415,9 @@ impl ProtoLanguageServer {
         if let Some(diagnostics) =
             self.state
                 .upsert_file(&uri, content, &ipath, 8, &pconf.config, true)
+            && let Err(e) = self.client.publish_diagnostics(diagnostics)
         {
-            if let Err(e) = self.client.publish_diagnostics(diagnostics) {
-                error!(error=%e, "failed to publish diagnostics")
-            }
+            error!(error=%e, "failed to publish diagnostics")
         }
         ControlFlow::Continue(())
     }
@@ -441,10 +440,9 @@ impl ProtoLanguageServer {
         if let Some(diagnostics) =
             self.state
                 .upsert_file(&uri, content, &ipath, 8, &pconf.config, true)
+            && let Err(e) = self.client.publish_diagnostics(diagnostics)
         {
-            if let Err(e) = self.client.publish_diagnostics(diagnostics) {
-                error!(error=%e, "failed to publish diagnostics")
-            }
+            error!(error=%e, "failed to publish diagnostics")
         }
         ControlFlow::Continue(())
     }
@@ -467,10 +465,9 @@ impl ProtoLanguageServer {
         if let Some(diagnostics) =
             self.state
                 .upsert_file(&uri, content, &ipath, 8, &pconf.config, false)
+            && let Err(e) = self.client.publish_diagnostics(diagnostics)
         {
-            if let Err(e) = self.client.publish_diagnostics(diagnostics) {
-                error!(error=%e, "failed to publish diagnostics")
-            }
+            error!(error=%e, "failed to publish diagnostics")
         }
         ControlFlow::Continue(())
     }

src/lsp.rs

@@ -151,7 +151,7 @@ impl ParsedTree {
         self.tree.root_node().descendant_for_point_range(pos, pos)
     }
 
-    pub fn find_all_nodes(&self, f: fn(&Node) -> bool) -> Vec<Node> {
+    pub fn find_all_nodes(&self, f: fn(&Node) -> bool) -> Vec<Node<'_>> {
         self.find_all_nodes_from(self.tree.root_node(), f)
     }
 
@@ -160,7 +160,7 @@ impl ParsedTree {
         Self::walk_and_filter(&mut cursor, f, false)
     }
 
-    pub fn find_first_node(&self, f: fn(&Node) -> bool) -> Vec<Node> {
+    pub fn find_first_node(&self, f: fn(&Node) -> bool) -> Vec<Node<'_>> {
         self.find_node_from(self.tree.root_node(), f)
     }
 
@@ -175,7 +175,7 @@ impl ParsedTree {
             .map(|n| n.utf8_text(content).expect("utf-8 parse error"))
     }
 
-    pub fn get_import_node(&self) -> Vec<Node> {
+    pub fn get_import_node(&self) -> Vec<Node<'_>> {
         self.find_all_nodes(NodeKind::is_import_path)
             .into_iter()
             .filter_map(|n| n.child_by_field_name("path"))

src/parser/tree.rs

@@ -54,28 +54,27 @@ impl ProtocDiagnostics {
             // Parse protoc error format: file:line:column: message
             if let Some((file_info, message)) = line.split_once(": ") {
                 let parts: Vec<&str> = file_info.split(':').collect();
-                if parts.len() >= 3 {
-                    if let (Ok(line), Ok(col)) = (parts[1].parse::<u32>(), parts[2].parse::<u32>())
-                    {
-                        let point = Point {
-                            row: (line - 1) as usize,
-                            column: (col - 1) as usize,
-                        };
-                        let diagnostic = Diagnostic {
-                            range: Range {
-                                start: ts_to_lsp_position(&point),
-                                end: ts_to_lsp_position(&Point {
-                                    row: point.row,
-                                    column: point.column + 1,
-                                }),
-                            },
-                            severity: Some(DiagnosticSeverity::ERROR),
-                            source: Some("protoc".to_string()),
-                            message: message.to_string(),
-                            ..Default::default()
-                        };
-                        diagnostics.push(diagnostic);
-                    }
+                if parts.len() >= 3
+                    && let (Ok(line), Ok(col)) = (parts[1].parse::<u32>(), parts[2].parse::<u32>())
+                {
+                    let point = Point {
+                        row: (line - 1) as usize,
+                        column: (col - 1) as usize,
+                    };
+                    let diagnostic = Diagnostic {
+                        range: Range {
+                            start: ts_to_lsp_position(&point),
+                            end: ts_to_lsp_position(&Point {
+                                row: point.row,
+                                column: point.column + 1,
+                            }),
+                        },
+                        severity: Some(DiagnosticSeverity::ERROR),
+                        source: Some("protoc".to_string()),
+                        message: message.to_string(),
+                        ..Default::default()
+                    };
+                    diagnostics.push(diagnostic);
                 }
             }
         }