Skip to content

Improved completion for a specific command, including support for resolving key=value pairs in the command line #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
czpilar wants to merge 6 commits into from
+386 −10
Closed

Improved completion for a specific command, including support for resolving key=value pairs in the command line #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9463bcd
Improved completion for a specific command, including support for res…
czpilar Dec 27, 2025
af0e0ff
Added tests for command completer
czpilar Dec 27, 2025
2a158b3
Added tests for command completer
czpilar Dec 27, 2025
6928cee
Improved CommandCompleterTest
czpilar Dec 27, 2025
ab14f94
Added tests for CommandCompleter for command with subcommand
czpilar Dec 27, 2025
073750d
Added tests for completion with two options where one is subset of other
czpilar Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions spring-shell-jline/src/main/java/org/springframework/shell/jline/CommandCompleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,11 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
}

private boolean isOptionPresent(ParsedLine line, CommandOption option) {
return option.longName() != null && line.line().contains(" --" + option.longName() + " ")
|| option.shortName() != ' ' && line.line().contains(" -" + option.shortName() + " ");
return option.longName() != null
&& (line.line().contains(" --" + option.longName() + " ")
|| line.line().contains(" --" + option.longName() + "="))
|| option.shortName() != ' ' && (line.line().contains(" -" + option.shortName() + " ")
|| line.line().contains(" -" + option.shortName() + "="));
}

@Nullable private Command findCommandByWords(List<String> words) {
Expand All @@ -89,15 +92,21 @@ private boolean isOptionPresent(ParsedLine line, CommandOption option) {
@Nullable private CommandOption findOptionByWords(List<String> words, List<CommandOption> options) {
List<String> reversed = new ArrayList<>(words);
Collections.reverse(reversed);
String optionName = reversed.stream().filter(word -> !word.trim().isEmpty()).findFirst().orElse("");
String optionName = reversed.stream()
.filter(word -> !word.trim().isEmpty())
.findFirst()
.filter(word -> !word.contains("=") || !reversed.get(0).isEmpty())
.orElse("");

for (CommandOption option : options) {
if (option.longName() != null && optionName.equals("--" + option.longName())
|| option.shortName() != ' ' && optionName.equals("-" + option.shortName())) {
return option;
}
}
return null;
return options.stream().filter(option -> isOptionEqual(optionName, option)).findFirst().orElse(null);
}

private static boolean isOptionEqual(String optionName, CommandOption option) {
return option.longName() != null
&& (optionName.equals("--" + option.longName())
|| optionName.startsWith("--" + option.longName() + "="))
|| option.shortName() != ' ' && (optionName.equals("-" + option.shortName())
|| optionName.startsWith("-" + option.shortName() + "="));
}

}
Loading