Merge pull request #33 from uros-5/nodejs-completion-duplicate

fix nodejs completion duplicate
uros-5 · Nov 22, 2024 · 6dc60b0 · 6dc60b0
2 parents e2f538c + daceb76
commit 6dc60b0
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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.21",
+  "version": "0.0.22",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

diff --git 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 {