rename add_global_context to add_link_hints

uros-5 · Sep 4, 2024 · 06a429d · 06a429d
1 parent 047f17c
commit 06a429d
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 25 deletions.
diff --git a/jinja-lsp-nodejs/index.d.ts b/jinja-lsp-nodejs/index.d.ts
@@ -76,11 +76,11 @@ export interface Action {
 export class NodejsLspFiles {
   constructor()
   /** Actions can come from unsaved context. */
-  addGlobalContext(uri: string, actions?: Array<Action> | undefined | null): void
+  addLinkHints(uri: string, actions?: Array<Action> | undefined | null): void
   deleteAll(filename: string): void
   addOne(id: number, filename: string, content: string, line: number, ext: string, col?: number | undefined | null): Array<JsIdentifier>
   getVariables(id: string, line: number): Array<JsIdentifier> | null
   hover(id: number, filename: string, line: number, position: JsPosition): JsHover | null
-  complete(id: number, filename: string, line: number, position: JsPosition): Array<JsCompletionItem> | null
+  complete(id: number, filename: string, line: number, position: JsPosition, linkHints?: string | undefined | null): Array<JsCompletionItem> | null
   gotoDefinition(id: number, filename: string, line: number, position: JsPosition): Array<JsLocation> | null
 }
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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "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.18",
+  "version": "0.0.19",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

diff --git a/jinja-lsp-nodejs/src/lib.rs b/jinja-lsp-nodejs/src/lib.rs
@@ -75,7 +75,7 @@ impl NodejsLspFiles {
 
   /// Actions can come from unsaved context.
   #[napi]
-  pub fn add_global_context(&mut self, uri: String, actions: Option<Vec<Action>>) {
+  pub fn add_link_hints(&mut self, uri: String, actions: Option<Vec<Action>>) {
     if let Some(actions) = actions {
       let mut identifiers = vec![];
       let mut action_objects = vec![];
@@ -315,6 +315,7 @@ impl NodejsLspFiles {
     filename: String,
     line: u32,
     mut position: JsPosition,
+    link_hints: Option<String>,
   ) -> Option<Vec<JsCompletionItem>> {
     position.line -= line;
     let original_uri = filename.to_string();
@@ -358,10 +359,10 @@ impl NodejsLspFiles {
       }
 
       CompletionType::Identifier => {
-        if let Some(variables) =
-          self
-            .lsp_files
-            .read_variables(&uri, position, None, Some(original_uri.to_string()))
+        let url = link_hints.unwrap_or(original_uri.to_string());
+        if let Some(variables) = self
+          .lsp_files
+          .read_variables(&uri, position, None, Some(url))
         {
           let mut ret = vec![];
           for item in variables {