Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix help command when a command is a prefix of another

Browse Source
This commit is contained in:
Eric Bottard
2015-11-16 10:11:54 +01:00
parent bea8d3ff0e
commit c8d2b7e383
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/shell/core/SimpleParser.java
View File

@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
@@ -1045,7 +1044,13 @@ public class SimpleParser implements Parser {
StringBuilder sb = new StringBuilder();
// Figure out if there's a single command we can offer help for
final Collection<MethodTarget> matchingTargets = locateTargets(buffer, false, false);
Collection<MethodTarget> matchingTargets = locateTargets(buffer, false, false);
for (MethodTarget candidate : matchingTargets) {
if (buffer.equals(candidate.getKey())) {
matchingTargets = Collections.singleton(candidate);
break;
}
}
if (matchingTargets.size() == 1) {
// Single command help
MethodTarget methodTarget = matchingTargets.iterator().next();
@@ -1115,8 +1120,6 @@ public class SimpleParser implements Parser {
}
LOGGER.info(sb.toString());
// LOGGER.warning("** Type 'hint' (without the quotes) and hit ENTER for step-by-step guidance **"
// + StringUtils.LINE_SEPARATOR);
}
}