Merge pull request #217 from xonixx/Improve-auto-complete-for-this-ca…

…se-#186 Improve auto complete for this case #186
xonixx · Apr 29, 2024 · 23d39c1 · 23d39c1
2 parents 5bf3104 + 576f0fd
commit 23d39c1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/main/java/intellij_awk/Awk.bnf b/src/main/java/intellij_awk/Awk.bnf
@@ -502,15 +502,11 @@ lvalue           ::= gawk_var_name | DOLLAR expr
 
 // XXX this covers a[1][2][3] like in Gawk
 // XXX awk only supports a[1]
-private gawk_var_name ::= var_name (LBRACKET expr_lst RBRACKET)*
-
-// XXX for some reason the below makes it terribly slow or hanging on profile5.awk
-/*private gawk_var_name ::= var_name (subscript_start RBRACKET)*
-private subscript_start ::= LBRACKET expr_lst {
+private gawk_var_name ::= var_name (subscript_start RBRACKET)*
+private subscript_start ::= LBRACKET expr_lst
+{
     pin=1
-    recoverWhile=recover_on_rbracket
 }
-private recover_on_rbracket ::= !RBRACKET*/
 
 private var_name ::= builtin_var_name | user_var_name
 

diff --git a/src/main/java/intellij_awk/AwkParserDefinition.java b/src/main/java/intellij_awk/AwkParserDefinition.java
@@ -26,7 +26,7 @@ public class AwkParserDefinition implements ParserDefinition {
       new IStubFileElementType<>(AwkLanguage.INSTANCE) {
         @Override
         public int getStubVersion() {
-          return 16;
+          return 17;
         }
 
         @Override

diff --git a/src/test/java/intellij_awk/AwkCompletionTests.java b/src/test/java/intellij_awk/AwkCompletionTests.java
@@ -430,21 +430,32 @@ public void testLocalVariableInAction3() {
   }
 
   public void testGlobalVariableInAction1() {
-    checkCompletionAuto("{ Xxx=1 } function f(){ Xx<caret> }", "{ Xxx=1 } function f(){ Xxx<caret> }");
+    checkCompletionAuto(
+        "{ Xxx=1 } function f(){ Xx<caret> }", "{ Xxx=1 } function f(){ Xxx<caret> }");
   }
+
   public void testGlobalVariableInAction2() {
     checkCompletionAuto("{ Xxx=1 }\nXx<caret>", "{ Xxx=1 }\nXxx<caret>");
   }
+
   public void testGlobalVariableInAction3() {
     checkCompletionAuto("/a/{ xxx=1 } /b/{ xx<caret> }", "/a/{ xxx=1 } /b/{ xxx<caret> }");
   }
+
   public void testGlobalVariableInAction4() {
-    checkCompletionAuto("function f(){ Xxx=1 } { Xx<caret> }", "function f(){ Xxx=1 } { Xxx<caret> }");
+    checkCompletionAuto(
+        "function f(){ Xxx=1 } { Xx<caret> }", "function f(){ Xxx=1 } { Xxx<caret> }");
   }
+
   public void testGlobalVariableInAction5_NotLocal() {
     checkCompletionEmpty("function f(Xxx){ Xxx=1 } { Xx<caret> }");
   }
 
+  public void testMustCompleteInsideEmptySubscript() {
+    checkCompletion(
+        Set.of("q1q2q3"), Set.of(), "BEGIN {\n    a[<caret>]\n}\n\nfunction q1q2q3() {\n}");
+  }
+
   private void checkFunctionArgs(String code, String fName, String expectedArgs) {
     setupCode(code);
     LookupElement[] variants = myFixture.completeBasic();