Should autocomplete variable in this case #207

xonixx · Dec 17, 2023 · 0de7ca3 · 0de7ca3
1 parent 788d782
commit 0de7ca3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/intellij_awk/AwkCompletionContributorVariables.java b/src/main/java/intellij_awk/AwkCompletionContributorVariables.java
@@ -81,7 +81,7 @@ private void addGlobalVarsInCurrentFile(
         awkFile,
         psiEl ->
             psiEl instanceof AwkUserVarNameMixin
-                && ((AwkUserVarNameMixin) psiEl).isInsideInitializingContext(),
+                && !((AwkUserVarNameMixin) psiEl).isALocalVariableInAFunction(),
         globalVars);
 
     for (PsiElement globalVar : globalVars) {

diff --git a/src/main/java/intellij_awk/psi/AwkUserVarNameMixin.java b/src/main/java/intellij_awk/psi/AwkUserVarNameMixin.java
@@ -158,10 +158,10 @@ public boolean isInsideInitializingContext() {
 
       AwkPattern pattern = awkItem.getPattern();
 
-      AwkFunctionNameMixin functionName = (AwkFunctionNameMixin) awkItem.getFunctionName();
+      AwkFunctionNameMixin functionName;
 
       return pattern != null && pattern.getBeginOrEnd() instanceof AwkBeginBlock
-          || functionName != null
+          || (functionName = (AwkFunctionNameMixin) awkItem.getFunctionName()) != null
               && functionName.isInitFunction()
               && !functionName
                   .getParameterNamesIncludingLocals()
@@ -170,4 +170,21 @@ public boolean isInsideInitializingContext() {
 
     return false;
   }
+
+  public boolean isALocalVariableInAFunction() {
+    AwkAction action = PsiTreeUtil.getTopmostParentOfType(this, AwkAction.class);
+    if (action == null) {
+      return false;
+    }
+
+    PsiElement parent = action.getParent();
+    if (parent instanceof AwkItem) {
+      AwkItem awkItem = (AwkItem) parent;
+      AwkFunctionNameMixin functionName = (AwkFunctionNameMixin) awkItem.getFunctionName();
+      return functionName != null
+          && functionName.getParameterNamesIncludingLocals().contains(getName()) /* local var */;
+    }
+
+    return false;
+  }
 }