Improve findOriginalDeclaration heuristics

Handle multiple variable assignments and declarations per
declaration command when searching inside functions

Author: mcecode

server/src/analyser.ts

@@ -382,19 +382,21 @@ export default class Analyzer {
               return false
             }
 
-            for (const a of n.descendantsOfType('variable_assignment')) {
-              const definedVariable = a.descendantsOfType('variable_name').at(0)
-              // In cases of var="$var", if $var is being renamed, the
-              // definition containing $var should be skipped and a higher scope
-              // should be checked.
+            for (const v of n.descendantsOfType('variable_name')) {
+              if (TreeSitterUtil.findParentOfType(v, ['simple_expansion', 'expansion'])) {
+                continue
+              }
+
+              // In cases of var="$var", if $var is being renamed, var should be
+              // skipped and a higher scope should be checked for the original
+              // declaration.
               const definedVariableInExpression =
-                a.endPosition.row >= position.line &&
-                !!definedVariable &&
-                (definedVariable.endPosition.column < position.character ||
-                  definedVariable.endPosition.row < position.line)
+                n.endPosition.row >= position.line &&
+                (v.endPosition.column < position.character ||
+                  v.endPosition.row < position.line)
 
-              if (definedVariable?.text === word && !definedVariableInExpression) {
-                declaration = definedVariable
+              if (v.text === word && !definedVariableInExpression) {
+                declaration = v
                 continueSearching = false
                 break
               }

server/src/util/tree-sitter.ts

@@ -57,6 +57,10 @@ export function findParent(
   return null
 }
 
-export function findParentOfType(start: SyntaxNode, type: string) {
-  return findParent(start, (n) => n.type === type)
+export function findParentOfType(start: SyntaxNode, type: string | string[]) {
+  if (typeof type === 'string') {
+    return findParent(start, (n) => n.type === type)
+  }
+
+  return findParent(start, (n) => type.includes(n.type))
 }