Widgets: executeWidget() restore old binding after runMacro()

jline · May 3, 2020 · 9613ec3 · 9613ec3
1 parent bf7f1ad
commit 9613ec3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -96,13 +96,12 @@ public void callWidget(String name) {
      * @param name widget name
      */
     public void executeWidget(String name) {
-        // WORK-AROUND
+        Binding ref = getKeyMap().getBoundKeys().get(alt(ctrl('X')));
         getKeyMap().bind(new Reference(name), alt(ctrl('X')));
         reader.runMacro(alt(ctrl('X')));
-        // The line below should be executed inside readLine()!!!
-        // Create LineReader method executeWidget() maybe???
-        //
-        // widget(name).apply();
+        if (ref != null) {
+            getKeyMap().bind(ref, alt(ctrl('X')));
+        }
     }
 
     /**
@@ -300,11 +299,9 @@ public void initDescription(int size) {
                 as.add(new AttributedString(""));
             }
             addDescription(as);
-            executeWidget(LineReader.REDRAW_LINE);
         } else if (status != null) {
             if (size < 0) {
                 status.update(null);
-                executeWidget(LineReader.REDRAW_LINE);
             } else {
                 status.clear();
             }
@@ -1054,6 +1051,7 @@ public boolean toggleWindow() {
             } else {
                 destroyDescription();
             }
+            callWidget(LineReader.REDRAW_LINE);
             return true;
         }
 
@@ -1067,6 +1065,7 @@ public boolean toggleKeyBindings() {
                     initDescription(descriptionSize);
                 }
             }
+            callWidget(LineReader.REDRAW_LINE);
             return enabled;
         }