Navigating grouped candidates using arrow keys is broken, fixes #580

jline · Sep 25, 2020 · 22faa8b · 22faa8b
1 parent d386045
commit 22faa8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/demo/src/main/scripts/init.jline b/demo/src/main/scripts/init.jline
@@ -113,7 +113,7 @@ def _testWidget() {
 #
 def _tailTipToggle() {
     def al = _reader.getWidgets().get('accept-line').toString()
-    def enabled = al == '_tailtip-accept-line' ? true : false
+    def enabled = al == '_tailtip-accept-line'
     if (enabled) {
         _reader.setVariable('LIST_MAX',100)
         _reader.option(org.jline.reader.LineReader.Option.INSERT_BRACKET, true)
@@ -133,18 +133,6 @@ 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
@@ -161,7 +149,6 @@ 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

diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -4903,7 +4903,11 @@ protected boolean doMenu(List<Candidate> original, String completed, BiFunction<
         original.sort(getCandidateComparator(caseInsensitive, completed));
         mergeCandidates(original);
         computePost(original, null, possible, completed);
-
+        // candidate grouping is not supported by MenuSupport
+        boolean defaultAutoGroup = isSet(Option.AUTO_GROUP);
+        boolean defaultGroup = isSet(Option.GROUP);
+        option(Option.AUTO_GROUP, false);
+        option(Option.GROUP, false);
         // Build menu support
         MenuSupport menuSupport = new MenuSupport(original, completed, escaper);
         post = menuSupport;
@@ -4960,12 +4964,16 @@ && getLastBinding().charAt(0) != ' '
                         pushBackBinding(true);
                     }
                     post = null;
+                    option(Option.AUTO_GROUP, defaultAutoGroup);
+                    option(Option.GROUP, defaultGroup);
                     return true;
                 }
             }
             doAutosuggestion = false;
             callWidget(REDISPLAY);
         }
+        option(Option.AUTO_GROUP, defaultAutoGroup);
+        option(Option.GROUP, defaultGroup);
         return false;
     }