Consider variables in read commands as declarations

Author: mcecode

server/src/analyser.ts

@@ -785,13 +785,7 @@ export default class Analyzer {
       }
     }
 
-    if (
-      node.type === 'word' &&
-      node.parent?.type === 'command' &&
-      node.parent.firstChild?.text === 'read' &&
-      !node.text.startsWith('-') &&
-      !/^-.*[dinNptu]$/.test(node.previousSibling?.text ?? '')
-    ) {
+    if (TreeSitterUtil.isVariableInReadCommand(node)) {
       return {
         word: node.text,
         range: TreeSitterUtil.range(node),

server/src/util/declarations.ts

@@ -361,6 +361,16 @@ export function findDeclarationUsingGlobalSemantics({
       return true
     }
 
+    if (
+      kind === LSP.SymbolKind.Variable &&
+      TreeSitterUtil.isVariableInReadCommand(n) &&
+      n.text === word
+    ) {
+      declaration = n
+      continueSearching = false
+      return false
+    }
+
     if (
       kind === LSP.SymbolKind.Function &&
       n.type === 'function_definition' &&

server/src/util/tree-sitter.ts

@@ -43,6 +43,20 @@ export function isReference(n: SyntaxNode): boolean {
   }
 }
 
+export function isVariableInReadCommand(n: SyntaxNode): boolean {
+  if (
+    n.type === 'word' &&
+    n.parent?.type === 'command' &&
+    n.parent.firstChild?.text === 'read' &&
+    !n.text.startsWith('-') &&
+    !/^-.*[dinNptu]$/.test(n.previousSibling?.text ?? '')
+  ) {
+    return true
+  }
+
+  return false
+}
+
 export function findParent(
   start: SyntaxNode,
   predicate: (n: SyntaxNode) => boolean,