TailTipWidgets: fix IndexOutOfBoundsException exception, fixes #482

jline · Dec 6, 2019 · 347b1c2 · 347b1c2
1 parent 94b6fcf
commit 347b1c2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -817,8 +817,6 @@ private void doCommandTailTip(String widget, CmdDesc cmdDesc, List<String> args)
                 }
             }
             String lastArg = !prevChar().equals(" ") ? args.get(args.size() - 1) : "";
-            if (lastArg.startsWith("-")) {
-            }
             int bpsize = argnum;
             boolean doTailTip = true;
             boolean noCompleters = false;
@@ -1320,7 +1318,7 @@ public List<AttributedString> getOptionDescription(String opt, int descriptionSi
                     AttributedStringBuilder asb = new AttributedStringBuilder().tabs(tabs);
                     asb.append(highlightOption(key));
                     asb.append("\t");
-                    asb.append(optsDesc.get(key).get(0));
+                    asb.append(optionDescription(key));
                     out.add(asb.toAttributedString());
                 }
             } else if (matched.size() <= 2*descriptionSize) {
@@ -1335,7 +1333,7 @@ public List<AttributedString> getOptionDescription(String opt, int descriptionSi
                     if (row < descriptionSize) {
                         asb.append(highlightOption(key));
                         asb.append("\t");
-                        asb.append(optsDesc.get(key).get(0));
+                        asb.append(optionDescription(key));
                         if (asb.columnLength() > columnWidth - 2) {
                             AttributedString trunc = asb.columnSubSequence(0, columnWidth - 5);
                             asb = new AttributedStringBuilder().tabs(tabs);
@@ -1352,7 +1350,7 @@ public List<AttributedString> getOptionDescription(String opt, int descriptionSi
                         asb.append(keyList.get(row - descriptionSize));
                         asb.append(highlightOption(key));
                         asb.append("\t");
-                        asb.append(optsDesc.get(key).get(0));
+                        asb.append(optionDescription(key));
                         keyList.remove(row - descriptionSize);
                         keyList.add(row - descriptionSize, asb.toAttributedString());
 
@@ -1382,6 +1380,10 @@ public List<AttributedString> getOptionDescription(String opt, int descriptionSi
             }
             return out;
         }
+
+        private AttributedString optionDescription(String key) {
+            return optsDesc.get(key).size() > 0 ? optsDesc.get(key).get(0) : new AttributedString("");
+        }
 
         private AttributedString highlightOption(String option) {
             return new AttributedStringBuilder()