Merge pull request #22 from uros-5/warnings

Warnings
uros-5 · Jun 21, 2024 · e8c1189 · e8c1189
2 parents e29ebd8 + b324436
commit e8c1189
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 53 deletions.
diff --git a/.github/workflows/CI-nodejs.yml b/.github/workflows/CI-nodejs.yml
@@ -9,7 +9,7 @@ permissions:
 'on':
   push:
     branches:
-      - completion-fix
+      - warnings
     tags-ignore:
       - '**'
     paths-ignore:

diff --git a/jinja-lsp-nodejs/npm/android-arm-eabi/package.json b/jinja-lsp-nodejs/npm/android-arm-eabi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-android-arm-eabi",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "android"
   ],

diff --git a/jinja-lsp-nodejs/npm/android-arm64/package.json b/jinja-lsp-nodejs/npm/android-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-android-arm64",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "android"
   ],

diff --git a/jinja-lsp-nodejs/npm/darwin-arm64/package.json b/jinja-lsp-nodejs/npm/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-darwin-arm64",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "darwin"
   ],

diff --git a/jinja-lsp-nodejs/npm/darwin-universal/package.json b/jinja-lsp-nodejs/npm/darwin-universal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-darwin-universal",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "darwin"
   ],

diff --git a/jinja-lsp-nodejs/npm/freebsd-x64/package.json b/jinja-lsp-nodejs/npm/freebsd-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-freebsd-x64",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "freebsd"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-arm-gnueabihf/package.json b/jinja-lsp-nodejs/npm/linux-arm-gnueabihf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-arm-gnueabihf",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-arm-musleabihf/package.json b/jinja-lsp-nodejs/npm/linux-arm-musleabihf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-arm-musleabihf",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-arm64-gnu/package.json b/jinja-lsp-nodejs/npm/linux-arm64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-arm64-gnu",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-arm64-musl/package.json b/jinja-lsp-nodejs/npm/linux-arm64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-arm64-musl",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-riscv64-gnu/package.json b/jinja-lsp-nodejs/npm/linux-riscv64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-riscv64-gnu",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-x64-gnu/package.json b/jinja-lsp-nodejs/npm/linux-x64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-x64-gnu",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/linux-x64-musl/package.json b/jinja-lsp-nodejs/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-linux-x64-musl",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "linux"
   ],

diff --git a/jinja-lsp-nodejs/npm/win32-arm64-msvc/package.json b/jinja-lsp-nodejs/npm/win32-arm64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-win32-arm64-msvc",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "win32"
   ],

diff --git a/jinja-lsp-nodejs/npm/win32-ia32-msvc/package.json b/jinja-lsp-nodejs/npm/win32-ia32-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-win32-ia32-msvc",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "win32"
   ],

diff --git a/jinja-lsp-nodejs/npm/win32-x64-msvc/package.json b/jinja-lsp-nodejs/npm/win32-x64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions-win32-x64-msvc",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "os": [
     "win32"
   ],

diff --git a/jinja-lsp-nodejs/package-lock.json b/jinja-lsp-nodejs/package-lock.json
diff --git a/jinja-lsp-nodejs/package.json b/jinja-lsp-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jinja-lsp/functions",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

diff --git a/jinja-lsp-nodejs/src/lib.rs b/jinja-lsp-nodejs/src/lib.rs
@@ -117,7 +117,7 @@ impl NodejsLspFiles {
         content,
       ),
     };
-    self.lsp_files.did_open(params);
+    self.lsp_files.did_open(params, true);
     match ext.as_str() {
       "jinja" => {
         let objects = self

diff --git a/jinja-lsp/src/channels/lsp.rs b/jinja-lsp/src/channels/lsp.rs
@@ -299,7 +299,7 @@ pub fn lsp_task(
                     }
                 }
                 LspMessage::DidOpen(params) => {
-                    if let Some(errors) = lsp_data.did_open(params) {
+                    if let Some(errors) = lsp_data.did_open(params, false) {
                         let _ = diagnostics_channel.send(errors).await;
                     }
                 }

diff --git a/jinja-lsp/src/lsp_files.rs b/jinja-lsp/src/lsp_files.rs
@@ -633,37 +633,35 @@ impl LspFiles {
                     kind: Some(identifier.identifier_type.completion_kind()),
                     ..Default::default() // detail: Some()
                 };
-                if &start_item == "" {
+                if start_item.is_empty() {
+                    items.push(completion_item);
+                } else if identifier.name.starts_with(&start_item) {
+                    let mut additional_text_edits = None;
+                    let text_edit = if self.is_vscode {
+                        let vec = vec![];
+                        let mut edits = vec;
+                        edits.push(TextEdit {
+                            range: incomplete_range,
+                            new_text: start_item.to_string(),
+                        });
+                        additional_text_edits = Some(edits);
+                        CompletionTextEdit::Edit(TextEdit {
+                            range: Range {
+                                start: incomplete_range.start,
+                                end: incomplete_range.start,
+                            },
+                            new_text: "".to_string(),
+                        })
+                    } else {
+                        CompletionTextEdit::InsertAndReplace(InsertReplaceEdit {
+                            new_text: identifier.name.to_string(),
+                            insert: incomplete_range,
+                            replace: incomplete_range,
+                        })
+                    };
+                    completion_item.text_edit = Some(text_edit);
+                    completion_item.additional_text_edits = additional_text_edits;
                     items.push(completion_item);
-                } else {
-                    if identifier.name.starts_with(&start_item) {
-                        let mut additional_text_edits = None;
-                        let text_edit = if self.is_vscode {
-                            let vec = vec![];
-                            let mut edits = vec;
-                            edits.push(TextEdit {
-                                range: incomplete_range,
-                                new_text: start_item.to_string(),
-                            });
-                            additional_text_edits = Some(edits);
-                            CompletionTextEdit::Edit(TextEdit {
-                                range: Range {
-                                    start: incomplete_range.start,
-                                    end: incomplete_range.start,
-                                },
-                                new_text: "".to_string(),
-                            })
-                        } else {
-                            CompletionTextEdit::InsertAndReplace(InsertReplaceEdit {
-                                new_text: identifier.name.to_string(),
-                                insert: incomplete_range,
-                                replace: incomplete_range,
-                            })
-                        };
-                        completion_item.text_edit = Some(text_edit);
-                        completion_item.additional_text_edits = additional_text_edits;
-                        items.push(completion_item);
-                    }
                 }
 
                 // let starts = starting
@@ -773,7 +771,11 @@ impl LspFiles {
         Some(v)
     }
 
-    pub fn did_open(&mut self, params: DidOpenTextDocumentParams) -> Option<DiagnosticMessage> {
+    pub fn did_open(
+        &mut self,
+        params: DidOpenTextDocumentParams,
+        ignore: bool,
+    ) -> Option<DiagnosticMessage> {
         let name = params.text_document.uri.as_str();
         let lang_type = self.config.file_ext(&Path::new(name))?;
         let file_content = params.text_document.text;
@@ -782,8 +784,11 @@ impl LspFiles {
         self.documents.insert(name.to_string(), rope);
         self.add_tree(name, lang_type, &file_content);
         self.add_variables(name, lang_type, &file_content);
-        let diagnostics = self.read_tree(name)?;
         let mut hm = HashMap::new();
+        if ignore {
+            return Some(DiagnosticMessage::Errors(hm));
+        }
+        let diagnostics = self.read_tree(name)?;
         hm.insert(name.to_owned(), diagnostics);
         let msg = DiagnosticMessage::Errors(hm);
         Some(msg)