Groovy REPL: improved var tab completion, restrictedCompletion=true

jline · Sep 11, 2020 · 2894fa7 · 2894fa7
1 parent db15475
commit 2894fa7
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/groovy/src/main/java/org/jline/script/GroovyEngine.java b/groovy/src/main/java/org/jline/script/GroovyEngine.java
@@ -914,11 +914,9 @@ private String defineArgs(String[] args) {
         }
 
         public void loadStatementVars(String line) {
-            if (restrictedCompletion) {
-                return;
-            }
             for (String s : line.split("\\r?\\n")) {
                 String statement = s.trim();
+                boolean constructedStatement = true;
                 try {
                     Matcher forEachMatcher = PATTERN_FOR_EACH.matcher(statement);
                     Matcher forMatcher = PATTERN_FOR.matcher(statement);
@@ -947,11 +945,18 @@ public void loadStatementVars(String line) {
                         statement = defineArgs(lambdaMatcher.group(1).split(","));
                     } else if (statement.contains("=")) {
                         statement = stripVarType(statement);
+                        constructedStatement = false;
                     }
                     Brackets br = new Brackets(statement);
                     if (statement.contains("=") && !br.openRound() && !br.openCurly() && !br.openSquare()) {
-                        String st = statement.substring(statement.indexOf('=') + 1).trim();
-                        if (!st.isEmpty() && !st.equals("new")) {
+                        int idx = statement.indexOf('=');
+                        String st = "null";
+                        if (restrictedCompletion && !constructedStatement && br.numberOfRounds() > 0) {
+                            statement = statement.substring(0, idx + 1) + "null";
+                        } else {
+                            st = statement.substring(idx + 1).trim();
+                        }
+                        if (!st.isEmpty() && !st.equals("new") ) {
                             execute(statement);
                         }
                     }