From 84d820bd4fcff3dffb3d8f1ecc1b15d6b0f083ae Mon Sep 17 00:00:00 2001 From: mohammadkhan Date: Tue, 25 Aug 2026 01:14:40 +0530 Subject: [PATCH 1/2] ci: fix lint and upgrade proto crate to 0.5.0 Signed-off-by: mohammadkhan --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/lsp.rs | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 057d307..50d6f73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1375,9 +1375,9 @@ checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782" [[package]] name = "tree-sitter-proto" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e410ccb5fa3cbd6bf7b8e512ecf7ad9d5254395b822bfe9f751b50fa978f31c" +checksum = "daf199052df77bd434c30a71c148773c21a3252e3545a8528151fc7bb931a723" dependencies = [ "cc", "tree-sitter-language", diff --git a/Cargo.toml b/Cargo.toml index a73551b..67d3a10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] } tree-sitter = "0.26" tracing-appender = "0.2" -tree-sitter-proto = "0.4" +tree-sitter-proto = "0.5" walkdir = "2.5" hard-xml = "1.41" tempfile = "3.27" diff --git a/src/lsp.rs b/src/lsp.rs index 5ca336b..6264865 100644 --- a/src/lsp.rs +++ b/src/lsp.rs @@ -296,12 +296,9 @@ impl ProtoLanguageServer { let all_edits: HashMap<_, _> = all_edits .into_iter() .filter(|(edit_uri, _)| { - workspace_root.as_ref().is_none_or(|root| { - edit_uri - .to_file_path() - .ok() - .is_some_and(|p| p.starts_with(root)) - }) + workspace_root + .as_ref() + .is_none_or(|root| edit_uri.to_file_path().is_ok_and(|p| p.starts_with(root))) }) .collect(); From b312bd821665a17362fe22e49ddf641cd7afef4e Mon Sep 17 00:00:00 2001 From: mohammadkhan Date: Tue, 25 Aug 2026 01:16:22 +0530 Subject: [PATCH 2/2] update insta snapshot Signed-off-by: mohammadkhan --- ...cument__docsymbol__test__test_proto2_document_symbols.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/document/snapshots/protols__document__docsymbol__test__test_proto2_document_symbols.snap b/src/document/snapshots/protols__document__docsymbol__test__test_proto2_document_symbols.snap index 3b013c2..1b5c0c0 100644 --- a/src/document/snapshots/protols__document__docsymbol__test__test_proto2_document_symbols.snap +++ b/src/document/snapshots/protols__document__docsymbol__test__test_proto2_document_symbols.snap @@ -11,8 +11,8 @@ expression: symbols line: 6 character: 0 end: - line: 34 - character: 3 + line: 35 + character: 1 selectionRange: start: line: 7