Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix not working completion in some cases and using the display text of a completion proposal #1256

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

Open
czpilar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix not working completion in some cases and using the display text of a completion proposal #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1b332
Fix using the display text of a completion proposal
czpilar Dec 30, 2025
3bc3738
Fix not working completion of options, option values and commands in …
czpilar Dec 31, 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
50 changes: 37 additions & 13 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 @@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;

/**
* A JLine {@link Completer} that completes command names from a {@link CommandRegistry}.
Expand Down Expand Up @@ -59,7 +60,8 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
commandByName, commandOption);
List<CompletionProposal> proposals = completionProvider.apply(context);
for (CompletionProposal proposal : proposals) {
candidates.add(new Candidate(proposal.value()));
candidates.add(new Candidate(proposal.value(), proposal.displayText(), proposal.category(),
proposal.description(), null, null, proposal.complete(), 0));
}
}
else {
Expand Down Expand Up @@ -92,27 +94,49 @@ private boolean isOptionPresent(ParsedLine line, CommandOption option) {
}
commandName.append(word).append(" ");
}
return this.commandRegistry.getCommandByName(commandName.toString().trim());

Command command = this.commandRegistry.getCommandByName(commandName.toString().trim());
// the command is found but was not completed on the line
if (command != null && command.getName().equals(String.join(" ", words))) {
command = null;
}
return command;
}

@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()
.filter(word -> !word.contains("=") || !reversed.get(0).isEmpty())
.orElse("");

return options.stream().filter(option -> isOptionEqual(optionName, option)).findFirst().orElse(null);
CommandOption option;
if (reversed.get(0).isEmpty()) {
// the option name was completed, but no value provided ---> "--optionName "
option = findOption(options, o -> isOptionEqual(reversed.get(1), o));
}
else {
// the option uses key-value pair ---> "--optionName=someValue"
option = findOption(options, o -> isOptionStartWith(reversed.get(0), o));

// the option uses completion on the value level ---> "--optionName someValue"
if (option == null) {
option = findOption(options, o -> isOptionEqual(reversed.get(1), o));
}
}

return option;
}

@Nullable private CommandOption findOption(List<CommandOption> options, Predicate<CommandOption> optionFilter) {
return options.stream().filter(optionFilter).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() + "="));
return option.longName() != null && optionName.equals("--" + option.longName())
|| option.shortName() != ' ' && optionName.equals("-" + option.shortName());
}

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

}
Loading