Console example: fixed widgets enabling/disabling

jline · May 31, 2020 · 1aa0bda · 1aa0bda
1 parent d31b678
commit 1aa0bda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/console/src/main/java/org/jline/console/Widgets.java b/console/src/main/java/org/jline/console/Widgets.java
@@ -382,19 +382,19 @@ public AutopairWidgets(LineReader reader, boolean addCurlyBrackets) {
 
         public void enable() {
             if (!enabled) {
-                executeWidget(AP_TOGGLE);
+                toggle();
             }
         }
 
         public void disable() {
             if (enabled) {
-                executeWidget(AP_TOGGLE);
+                toggle();
             }
         }
 
         public boolean toggle() {
             boolean before = enabled;
-            executeWidget(AP_TOGGLE);
+            toggleKeyBindings();
             return !before;
         }
 
@@ -822,7 +822,7 @@ public boolean isEnabled() {
 
         public void disable() {
             if (enabled) {
-                executeWidget(Widgets.TT_TOGGLE);
+                toggleKeyBindings();
             }
         }
 
@@ -1048,7 +1048,7 @@ public boolean toggleWindow() {
             } else {
                 destroyDescription();
             }
-            callWidget(LineReader.REDRAW_LINE);
+            executeWidget(LineReader.REDRAW_LINE);
             return true;
         }
 
@@ -1062,7 +1062,7 @@ public boolean toggleKeyBindings() {
                     initDescription(descriptionSize);
                 }
             }
-            callWidget(LineReader.REDRAW_LINE);
+            executeWidget(LineReader.REDRAW_LINE);
             return enabled;
         }
 

diff --git a/console/src/test/java/org/jline/example/Console.java b/console/src/test/java/org/jline/example/Console.java
@@ -233,6 +233,9 @@ private void sleep(CommandInput input) {
 
         private void autopair(CommandInput input) {
             try {
+                if (tailtipWidgets.isEnabled()) {
+                    tailtipWidgets.disable();
+                }
                 terminal().writer().print("Autopair widgets are ");
                 if (autopairWidgets.toggle()) {
                     terminal().writer().println("enabled.");
@@ -254,7 +257,7 @@ private void autosuggestion(CommandInput input) {
                         autosuggestionWidgets.enable();
                     } else if (type.startsWith("tai")) {
                         autosuggestionWidgets.disable();
-                        tailtipWidgets.enable();
+                        autopairWidgets.disable();
                         if (argv.length > 1) {
                             String mode = argv[1].toLowerCase();
                             if (mode.startsWith("tai")) {
@@ -265,6 +268,7 @@ private void autosuggestion(CommandInput input) {
                                 tailtipWidgets.setTipType(TipType.COMBINED);
                             }
                         }
+                        tailtipWidgets.enable();
                     } else if (type.startsWith("com")) {
                         autosuggestionWidgets.disable();
                         tailtipWidgets.disable();
@@ -402,7 +406,7 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
                     break;
                 }
                 catch (Exception e) {
-                    masterRegistry.trace(e);
+                    masterRegistry.trace(true, e);
                 }
             }
             masterRegistry.close();