updated tree-sitter-jinja2 version, updated search/objects.rs

uros-5 · Aug 29, 2024 · af49f6f · af49f6f
1 parent b31a397
commit af49f6f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/jinja-lsp-nodejs/src/lib.rs b/jinja-lsp-nodejs/src/lib.rs
@@ -113,7 +113,7 @@ impl NodejsLspFiles {
     let col = col.unwrap_or(0);
     let mut space_before = String::new();
     for _ in 0..col {
-      space_before.push_str(" ");
+      space_before.push(' ');
     }
     content = format!("{space_before}{content}");
     let mut all_identifiers = vec![];
@@ -317,7 +317,7 @@ impl NodejsLspFiles {
     mut position: JsPosition,
   ) -> Option<Vec<JsCompletionItem>> {
     position.line -= line;
-    let original_uri = &format!("{filename}");
+    let original_uri = filename.to_string();
     let uri = Url::parse(&format!("file:///home/{filename}.{id}.jinja")).unwrap();
     let position = Position::new(position.line, position.character);
     let params: CompletionParams = CompletionParams {
@@ -333,7 +333,7 @@ impl NodejsLspFiles {
       },
       context: Some(CompletionContext {
         trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
-        trigger_character: None,
+        trigger_character: Some(String::from("{")),
       }),
     };
     let completion = self.lsp_files.completion(params)?;

diff --git a/jinja-lsp-queries/Cargo.toml b/jinja-lsp-queries/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [dependencies]
 tree-sitter = "0.23.0"
-tree-sitter-jinja2 = "0.0.9"
+tree-sitter-jinja2 = "0.0.10"
 tree-sitter-rust = "0.21.2"
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 ropey = "1.5.0"

diff --git a/jinja-lsp-queries/src/search/objects.rs b/jinja-lsp-queries/src/search/objects.rs
@@ -243,7 +243,8 @@ pub fn objects_query(
                     break 'loop1;
                 }
             } else if smaller {
-                if objects.is_filter() {
+                let name = capture_names[capture.index as usize];
+                if objects.is_filter() || name == "expr" {
                     break 'loop1;
                 } else if !continued {
                     if objects.is_hover(trigger_point) {

diff --git a/jinja-lsp-queries/src/search/test_queries.rs b/jinja-lsp-queries/src/search/test_queries.rs
@@ -287,6 +287,10 @@ mod query_tests {
                     false,
                 )),
             ),
+            (
+                Point::new(11, 14),
+                Some((CompletionType::Identifier, false)),
+            ),
         ];
         for case in cases {
             let tree = prepare_jinja_tree(source);

diff --git a/jinja-lsp/Cargo.toml b/jinja-lsp/Cargo.toml
@@ -29,7 +29,7 @@ serde = { version = "1.0", features = ["derive"] }
 tree-sitter = "^0.23.0"
 walkdir = "2.4.0"
 anyhow = "1.0.75"
-tree-sitter-jinja2 = "0.0.9"
+tree-sitter-jinja2 = "0.0.10"
 tree-sitter-rust = "^0.21.2"
 jinja-lsp-queries = { path = "../jinja-lsp-queries", version = "0.1.81"}
 tree-sitter-language = "0.1.0"
diff --git a/jinja-lsp/src/channels/lsp.rs b/jinja-lsp/src/channels/lsp.rs
@@ -84,6 +84,7 @@ pub fn lsp_task(
                                     "\"".to_string(),
                                     " ".to_string(),
                                     "%".to_string(),
+                                    "{".to_string(),
                                 ]),
                                 all_commit_characters: None,
                                 work_done_progress_options: Default::default(),

diff --git a/jinja-lsp/src/lsp_files.rs b/jinja-lsp/src/lsp_files.rs
@@ -903,6 +903,9 @@ impl LspFiles {
         for i in ids {
             self.documents.remove(&i);
             self.variables.remove(&i);
+            if let Some(templates) = self.trees.get_mut(&LangType::Template) {
+                templates.remove(&i);
+            }
         }
     }
 }