Groovy REPL: add widget to toggle candidate grouping and fix a bug in…

… identifiers completion
jline · Sep 24, 2020 · d386045 · d386045
1 parent cda92e3
commit d386045
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/demo/src/main/scripts/init.jline b/demo/src/main/scripts/init.jline
@@ -133,6 +133,19 @@ def _docJline() {
 def _docGroovy() {
     :doc groovy
 }
+#
+# widget function to toggle candidate grouping
+#
+def _toggleGroup(){
+    if (_reader.isSet(org.jline.reader.LineReader.Option.AUTO_GROUP)) {
+        :setopt no-group
+        :setopt no-auto-group
+    } else {
+        :unsetopt no-group
+        :unsetopt no-auto-group
+    }
+}
+
 #
 # resolve function keys
 #
@@ -148,9 +161,11 @@ widget -N _test-widget _testWidget
 widget -N _tailtip-toggle _tailTipToggle
 widget -N _doc-jline _docJline
 widget -N _doc-groovy _docGroovy
+widget -N _toggle-group _toggleGroup
 
 keymap '^[^x' _test-widget
 keymap '^[s'  _tailtip-toggle
+keymap '^[a'  _toggle-group
 if (_f1 && _f2) {
     :keymap $_f1   _doc-jline
     :keymap $_f2   _doc-groovy

diff --git a/groovy/src/main/java/org/jline/script/GroovyEngine.java b/groovy/src/main/java/org/jline/script/GroovyEngine.java
@@ -876,9 +876,14 @@ private void doMethodCandidates(List<Candidate> candidates, Class<?> clazz, Stri
                 Set<String> identifiers = new HashSet<>();
                 for (String m : methods) {
                     if (m.matches("get[A-Z].*")) {
-                        char[] c = m.substring(3).toCharArray();
-                        c[0] = Character.toLowerCase(c[0]);
-                        identifiers.add(new String(c));
+                        try {
+                            clazz.getDeclaredMethod(m);
+                            char[] c = m.substring(3).toCharArray();
+                            c[0] = Character.toLowerCase(c[0]);
+                            identifiers.add(new String(c));
+                        } catch (NoSuchMethodException e) {
+                            // ignore
+                        }
                     }
                 }
                 Helpers.doCandidates(candidates, identifiers, curBuf, hint, CandidateType.IDENTIFIER);