Fixed hover and go to definition not working when cursor is right at …

…start of the function name / keyword
eyza-cod2 · Nov 4, 2024 · b3d7968 · b3d7968
1 parent 0524f63
commit b3d7968
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/src/GscDefinitionProvider.ts b/src/GscDefinitionProvider.ts
@@ -40,7 +40,7 @@ export class GscDefinitionProvider implements vscode.DefinitionProvider {
         const gscData = gscFile.data;
 
         // Get group before cursor
-        var groupAtCursor = gscData.root.findGroupOnLeftAtPosition(position);
+        var groupAtCursor = gscData.root.findKeywordAtPosition(position);
         if (groupAtCursor === undefined || groupAtCursor.parent === undefined) {
             return locations;
         }

diff --git a/src/GscFileParser.ts b/src/GscFileParser.ts
@@ -2887,6 +2887,52 @@ export class GscGroup {
     }
 
 
+
+
+    public findKeywordAtPosition(position: vscode.Position, token?: GscToken): GscGroup | undefined {
+
+        if (token === undefined) {
+            // Loop all tokens
+            for (const t of this.tokensAll) {
+                const t2 = this.tokensAll.at(t.index + 1);
+
+                if (position.isBefore(t.range.start)) {
+                    return undefined;
+                }
+
+                // Next is keyword, make this range check smaller
+                if (t2?.type === TokenType.Keyword) {
+                    if (position.isAfterOrEqual(t.range.start) && position.isBefore(t.range.end)) {
+                        token = t;
+                        break;
+                    }
+                } else {
+                    if (position.isAfterOrEqual(t.range.start) && position.isBeforeOrEqual(t.range.end)) {
+                        token = t;
+                        break;
+                    }
+                }
+
+            }
+        }
+        if (token === undefined) {
+            return undefined;
+        }
+
+        // Find the group owning the token
+        for (const group of this.items) {
+            if (token.index >= group.tokenIndexStart && token.index <= group.tokenIndexEnd) {
+                const group2 = group.findKeywordAtPosition(position);
+                if (group2 === undefined) {
+                    return group;
+                }
+                return group2;
+            }
+        }
+    }
+
+
+
     /**
      * Find parent group of current group that contains given range.
      */

diff --git a/src/GscHoverProvider.ts b/src/GscHoverProvider.ts
@@ -50,7 +50,7 @@ export class GscHoverProvider implements vscode.HoverProvider {
         const errorDiagnosticsDisabled = gscFile.config.errorDiagnostics === ConfigErrorDiagnostics.Disable;
 
         // Get group before cursor
-        var groupAtCursor = gscData.root.findGroupOnLeftAtPosition(position);
+        var groupAtCursor = gscData.root.findKeywordAtPosition(position);
 
         if (groupAtCursor?.type === GroupType.FunctionName) {
             const funcInfo = groupAtCursor.getFunctionReferenceInfo();

diff --git a/src/GscReferenceProvider.ts b/src/GscReferenceProvider.ts
@@ -41,7 +41,7 @@ export class GscReferenceProvider implements vscode.ReferenceProvider {
         const gscData = gscFile.data;
 
         // Get group before cursor
-        var groupAtCursor = gscData.root.findGroupOnLeftAtPosition(position);
+        var groupAtCursor = gscData.root.findKeywordAtPosition(position);
         if (groupAtCursor === undefined || groupAtCursor.parent === undefined) {
             return locations;
         }