SystemHighlighter: fix subcommand highlighting

jline · Jan 24, 2022 · 4b74323 · 4b74323
1 parent ac26d10
commit 4b74323
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/console/src/main/java/org/jline/console/impl/SystemHighlighter.java b/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
@@ -194,17 +194,19 @@ protected AttributedString doFileOptsHighlight(LineReader reader, String buffer,
             ParsedLine parsedLine = reader.getParser().parse(buffer, buffer.length() + 1, Parser.ParseContext.COMPLETE);
             List<String> words = parsedLine.words();
             if (!fhc.isSubcommand() || (words.size() > 2 && fhc.getSubcommand().equals(words.get(1)))) {
-                int firstArg = fhc.isSubcommand() ? 1 : 0;
-                int idx = buffer.indexOf(words.get(firstArg)) + words.get(firstArg).length() + 1;
-                highlightArgs(buffer.substring(commandIndex, idx), asb);
+                boolean subCommand = fhc.isSubcommand();
+                int idx = buffer.indexOf(words.get(0)) + words.get(0).length();
                 boolean fileOption = false;
-                for (int i = firstArg + 1; i < words.size(); i++) {
+                for (int i = 1; i < words.size(); i++) {
                     int nextIdx = buffer.substring(idx).indexOf(words.get(i)) + idx;
                     for (int j = idx; j < nextIdx; j++) {
                         asb.append(buffer.charAt(j));
                     }
                     String word = words.get(i);
-                    if (word.contains("=") && fhc.getFileOptions().contains(word.substring(0, word.indexOf("=")))) {
+                    if (subCommand) {
+                        subCommand = false;
+                        highlightArgs(word, asb);
+                    } else if (word.contains("=") && fhc.getFileOptions().contains(word.substring(0, word.indexOf("=")))) {
                         highlightArgs(word.substring(0, word.indexOf("=") + 1), asb);
                         highlightFileArg(reader, word.substring(word.indexOf("=") + 1), asb);
                     } else if (fhc.getFileOptions().contains(word)) {
@@ -234,16 +236,20 @@ protected AttributedString doFileArgsHighlight(LineReader reader, String buffer,
             ParsedLine parsedLine = reader.getParser().parse(buffer, buffer.length() + 1, Parser.ParseContext.COMPLETE);
             List<String> words = parsedLine.words();
             if (!fhc.isSubcommand() || (words.size() > 2 && fhc.getSubcommand().equals(words.get(1)))) {
-                int firstArg = fhc.isSubcommand() ? 1 : 0;
-                int idx = buffer.indexOf(words.get(firstArg)) + words.get(firstArg).length();
-                highlightArgs(buffer.substring(commandIndex, idx), asb);
-                for (int i = firstArg + 1; i < words.size(); i++) {
+                boolean subCommand = fhc.isSubcommand();
+                int idx = buffer.indexOf(words.get(0)) + words.get(0).length();
+                for (int i = 1; i < words.size(); i++) {
                     int nextIdx = buffer.substring(idx).indexOf(words.get(i)) + idx;
                     for (int j = idx; j < nextIdx; j++) {
                         asb.append(buffer.charAt(j));
                     }
-                    highlightFileArg(reader, words.get(i), asb);
-                    idx = nextIdx + words.get(i).length();
+                    if (subCommand) {
+                        subCommand = false;
+                        highlightArgs(words.get(i), asb);
+                    } else {
+                        highlightFileArg(reader, words.get(i), asb);
+                        idx = nextIdx + words.get(i).length();
+                    }
                 }
             } else {
                 highlightArgs(buffer.substring(commandIndex), asb);