Groovy REPL: string variable assignment tab complete with current val…

…ue, step II
jline · Jan 24, 2021 · 859bc82 · 859bc82
1 parent 913862f
commit 859bc82
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/groovy/src/main/java/org/jline/script/GroovyEngine.java b/groovy/src/main/java/org/jline/script/GroovyEngine.java
@@ -764,18 +764,18 @@ public void complete(LineReader reader, ParsedLine commandLine, List<Candidate>
             }
             String wordbuffer = commandLine.word();
             String buffer = commandLine.line().substring(0, commandLine.cursor());
+            inspector = new Inspector(groovyEngine);
+            inspector.loadStatementVars(buffer);
+            if (commandLine.words().size() == 1 && wordbuffer.contains("=")) {
+                int idx = wordbuffer.indexOf("=");
+                doValueCandidate(candidates, wordbuffer.substring(0, idx), wordbuffer.substring(0, idx + 1));
+            }
             Brackets brackets;
             try {
                 brackets = new Brackets(buffer);
             } catch (Exception e) {
                 return;
             }
-            inspector = new Inspector(groovyEngine);
-            inspector.loadStatementVars(buffer);
-            if (commandLine.words().size() == 1 && wordbuffer.contains("=")) {
-                int idx = wordbuffer.indexOf("=");
-                doValueCandidate(candidates, inspector.execute(wordbuffer.substring(0, idx)), wordbuffer.substring(0, idx + 1));
-            }
             if (brackets.openQuote()) {
                 return;
             }
@@ -890,9 +890,14 @@ private void doIdentifierCandidates(List<Candidate> candidates, Object object, S
             Helpers.doCandidates(candidates, (Set<String>)map.keySet(), curBuf, CandidateType.IDENTIFIER);
         }
 
-        private void doValueCandidate(List<Candidate> candidates, Object object, String curBuf) {
-            if (object instanceof String) {
-                Helpers.doCandidates(candidates, Collections.singletonList((String)object), curBuf, CandidateType.STRING);
+        private void doValueCandidate(List<Candidate> candidates, String objectStatement, String curBuf) {
+            try {
+                Object object = inspector.execute(objectStatement);
+                if (object instanceof String) {
+                    Helpers.doCandidates(candidates, Collections.singletonList((String) object), curBuf, CandidateType.STRING);
+                }
+            } catch (Exception e) {
+                // ignore
             }
         }