TailTipWidgets: added boolean field command in CmdDesc class

jline · Nov 13, 2019 · 4083481 · 4083481
1 parent 3a5d132
commit 4083481
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -192,11 +192,11 @@ public void initDescription(int size) {
                 as.add(new AttributedString(""));
             }
             addDescription(as);
-            reader.runMacro(KeyMap.ctrl('M'));
+            executeWidget(LineReader.REDRAW_LINE);
         } else if (status != null) {
             if (size < 0) {
                 status.update(null);
-                reader.runMacro(KeyMap.ctrl('M'));
+                executeWidget(LineReader.REDRAW_LINE);
             } else {
                 status.clear();
             }
@@ -781,7 +781,9 @@ private boolean doTailTip(String widget) {
                     resetTailTip();
                 } else if (cmdDesc.isValid()) {
                     if (cmdkey.getV()) {
-                        doCommandTailTip(widget, cmdDesc, args);
+                        if (cmdDesc.isCommand()) {
+                            doCommandTailTip(widget, cmdDesc, args);
+                        }
                     } else {
                         doDescription(cmdDesc.getMainDescription(descriptionSize));
                         setErrorPattern(cmdDesc.getErrorPattern());
@@ -1165,8 +1167,10 @@ public static class CmdDesc {
         private Pattern errorPattern;
         private int errorIndex = -1;
         private boolean valid = true;
+        private boolean command = false;
 
         public CmdDesc() {
+            command = false;
         }
 
         public CmdDesc(boolean valid) {
@@ -1190,11 +1194,16 @@ public CmdDesc(List<AttributedString> mainDesc, List<ArgDesc> argsDesc, Map<Stri
             } else {
                 this.mainDesc = new ArrayList<>(mainDesc);
             }
+            this.command = true;
         }
 
         public boolean isValid() {
             return valid;
         }
+
+        public boolean isCommand() {
+            return command;
+        }
 
         public CmdDesc mainDesc(List<AttributedString> mainDesc) {
             this.mainDesc = new ArrayList<>(mainDesc);