From 95bfa7f7dc4bf214f3ab0f878033b3a27b737f8c Mon Sep 17 00:00:00 2001 From: Uros Mrkobrada Date: Wed, 20 Nov 2024 21:57:55 +0100 Subject: [PATCH 1/2] jinja-lsp-nodejs: fix duplicate items in completion --- jinja-lsp-nodejs/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jinja-lsp-nodejs/src/lib.rs b/jinja-lsp-nodejs/src/lib.rs index 0e09797..ff6b6ed 100644 --- a/jinja-lsp-nodejs/src/lib.rs +++ b/jinja-lsp-nodejs/src/lib.rs @@ -88,7 +88,7 @@ impl NodejsLspFiles { } self.actions.insert(uri.to_string(), actions); self.action_objects.insert(uri.to_string(), action_objects); - self.lsp_files.variables.insert(uri, identifiers); + // self.lsp_files.variables.insert(uri, identifiers); } } @@ -302,7 +302,7 @@ impl NodejsLspFiles { let value = data_type.completion_detail().to_owned(); let value = format!("{value}\n\n---\n**{}**", &full_name); let actions = vec![]; - let actions = self.actions.get(&filename).unwrap_or(&actions); + let actions = self.actions.get("temp").unwrap_or(&actions); let action = Action { name: full_name.to_owned(), description: value.to_owned(), @@ -389,7 +389,8 @@ impl NodejsLspFiles { CompletionType::Identifier => { let empty = vec![]; - let actions = self.actions.get("temp").unwrap_or(&empty); + let actions = self.actions.get("temp_").unwrap_or(&empty); + if let Some(variables) = self.lsp_files.read_variables(&uri, position, None, None) { let mut ret = vec![]; for item in actions { From daceb766860b5b8337869e667b9ffbf2f95fbfd4 Mon Sep 17 00:00:00 2001 From: Uros Mrkobrada Date: Fri, 22 Nov 2024 10:31:42 +0100 Subject: [PATCH 2/2] 0.0.22 --- .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 22e39d7..3044fe1 100644 --- a/.github/workflows/CI-nodejs.yml +++ b/.github/workflows/CI-nodejs.yml @@ -9,7 +9,7 @@ permissions: 'on': push: branches: - - extending-link-hint-literal + - nodejs-completion-duplicate 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 6a36249..112878c 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.21", + "version": "0.0.22", "os": [ "android" ], diff --git a/jinja-lsp-nodejs/npm/android-arm64/package.json b/jinja-lsp-nodejs/npm/android-arm64/package.json index 8cbfe5e..63469f1 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.21", + "version": "0.0.22", "os": [ "android" ], diff --git a/jinja-lsp-nodejs/npm/darwin-arm64/package.json b/jinja-lsp-nodejs/npm/darwin-arm64/package.json index 71bc41a..0449ee5 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.21", + "version": "0.0.22", "os": [ "darwin" ], diff --git a/jinja-lsp-nodejs/npm/darwin-universal/package.json b/jinja-lsp-nodejs/npm/darwin-universal/package.json index 6e36d6f..1be2bf0 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.21", + "version": "0.0.22", "os": [ "darwin" ], diff --git a/jinja-lsp-nodejs/npm/freebsd-x64/package.json b/jinja-lsp-nodejs/npm/freebsd-x64/package.json index 5a574a1..737ec0a 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.21", + "version": "0.0.22", "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 8ef1d67..1f8157c 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.21", + "version": "0.0.22", "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 f2fce72..de5e906 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.21", + "version": "0.0.22", "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 1c3a5df..1c0c80e 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.21", + "version": "0.0.22", "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 c88ae11..d1be4ba 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.21", + "version": "0.0.22", "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 39747d0..7adc740 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.21", + "version": "0.0.22", "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 dbdfe78..f75aef8 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.21", + "version": "0.0.22", "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 64c53aa..5169fec 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.21", + "version": "0.0.22", "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 6d3e3d4..fba35ca 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.21", + "version": "0.0.22", "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 0e09c7f..61e474a 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.21", + "version": "0.0.22", "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 2ab5fb9..5502eb4 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.21", + "version": "0.0.22", "os": [ "win32" ], diff --git a/jinja-lsp-nodejs/package-lock.json b/jinja-lsp-nodejs/package-lock.json index 0763492..abce1c3 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.21", + "version": "0.0.22", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@jinja-lsp/functions", - "version": "0.0.21", + "version": "0.0.22", "license": "MIT", "devDependencies": { "@napi-rs/cli": "^2.18.3", diff --git a/jinja-lsp-nodejs/package.json b/jinja-lsp-nodejs/package.json index f7dfd52..b5d76db 100644 --- a/jinja-lsp-nodejs/package.json +++ b/jinja-lsp-nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@jinja-lsp/functions", - "version": "0.0.21", + "version": "0.0.22", "main": "index.js", "types": "index.d.ts", "napi": {