From 1c3d53107f066540006c78aac35aa6dcfbe209ca Mon Sep 17 00:00:00 2001 From: Uros Mrkobrada Date: Fri, 21 Jun 2024 14:51:56 +0200 Subject: [PATCH 1/2] added option for disabling warnings --- jinja-lsp-nodejs/src/lib.rs | 2 +- jinja-lsp/src/channels/lsp.rs | 2 +- jinja-lsp/src/lsp_files.rs | 69 +++++++++++++++++++---------------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/jinja-lsp-nodejs/src/lib.rs b/jinja-lsp-nodejs/src/lib.rs index f1b7498..be7a2d8 100644 --- 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 index 9d36e14..7735261 100644 --- 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 index 22cc4c5..58d41f3 100644 --- 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 { + pub fn did_open( + &mut self, + params: DidOpenTextDocumentParams, + ignore: bool, + ) -> Option { 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) From b3244366370d7aa00ca40426dee28a552ae2ef82 Mon Sep 17 00:00:00 2001 From: Uros Mrkobrada Date: Fri, 21 Jun 2024 14:58:34 +0200 Subject: [PATCH 2/2] 0.0.10 --- .github/workflows/CI-nodejs.yml | 2 +- jinja-lsp-nodejs/npm/android-arm-eabi/package.json | 2 +- jinja-lsp-nodejs/npm/android-arm64/package.json | 2 +- jinja-lsp-nodejs/npm/darwin-arm64/package.json | 2 +- jinja-lsp-nodejs/npm/darwin-universal/package.json | 2 +- jinja-lsp-nodejs/npm/freebsd-x64/package.json | 2 +- jinja-lsp-nodejs/npm/linux-arm-gnueabihf/package.json | 2 +- jinja-lsp-nodejs/npm/linux-arm-musleabihf/package.json | 2 +- jinja-lsp-nodejs/npm/linux-arm64-gnu/package.json | 2 +- jinja-lsp-nodejs/npm/linux-arm64-musl/package.json | 2 +- jinja-lsp-nodejs/npm/linux-riscv64-gnu/package.json | 2 +- jinja-lsp-nodejs/npm/linux-x64-gnu/package.json | 2 +- jinja-lsp-nodejs/npm/linux-x64-musl/package.json | 2 +- jinja-lsp-nodejs/npm/win32-arm64-msvc/package.json | 2 +- jinja-lsp-nodejs/npm/win32-ia32-msvc/package.json | 2 +- jinja-lsp-nodejs/npm/win32-x64-msvc/package.json | 2 +- jinja-lsp-nodejs/package-lock.json | 4 ++-- jinja-lsp-nodejs/package.json | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/CI-nodejs.yml b/.github/workflows/CI-nodejs.yml index bad8a48..2d1b5d5 100644 --- 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 index 6a8eb91..bc6ea2a 100644 --- 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 index 408e6f2..b9d73cb 100644 --- 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 index e92098b..6d01e72 100644 --- 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 index 7d31d62..10ee3a3 100644 --- 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 index 2e40454..e0af3fc 100644 --- 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 index 29e8772..bc130a5 100644 --- 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 index 630f9de..c18ffdb 100644 --- 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 index 777260c..7b84485 100644 --- 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 index cfdd8a9..d163360 100644 --- 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 index 220b813..8ed6bc4 100644 --- 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 index 06e3dbf..e7d1529 100644 --- 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 index 11f7869..18573e2 100644 --- 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 index 05e8f74..e014953 100644 --- 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 index 0ebad34..8bf5f78 100644 --- 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 index 22e045f..2a71271 100644 --- 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 index 8fb454a..a338d6b 100644 --- a/jinja-lsp-nodejs/package-lock.json +++ b/jinja-lsp-nodejs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jinja-lsp/functions", - "version": "0.0.9", + "version": "0.0.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@jinja-lsp/functions", - "version": "0.0.9", + "version": "0.0.10", "license": "MIT", "devDependencies": { "@napi-rs/cli": "^2.18.3", diff --git a/jinja-lsp-nodejs/package.json b/jinja-lsp-nodejs/package.json index 983d2f7..bff318a 100644 --- 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": {