You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/09/19 09:43:38 UTC
git commit: [KARAF-3055] Fix overlap with subshell starting with the
same String
Repository: karaf
Updated Branches:
refs/heads/master c0589bc4b -> 429163352
[KARAF-3055] Fix overlap with subshell starting with the same String
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/42916335
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/42916335
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/42916335
Branch: refs/heads/master
Commit: 429163352a05973a0a28b4f6e15f050e882df02a
Parents: c0589bc
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Sep 19 09:41:26 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Sep 19 09:41:26 2014 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/impl/console/CommandsCompleter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/42916335/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java
index 2a513cb..66d8f6a4 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java
@@ -75,7 +75,7 @@ public class CommandsCompleter extends org.apache.karaf.shell.support.completers
}
List<Completer> completers = new ArrayList<Completer>();
for (String name : allCompleters[1].keySet()) {
- if (name.startsWith(subShell)) {
+ if (name.startsWith(subShell + ":")) {
completers.add(allCompleters[1].get(name));
}
}
@@ -87,11 +87,12 @@ public class CommandsCompleter extends org.apache.karaf.shell.support.completers
return res;
}
+ // FIRST mode
if (Session.COMPLETION_MODE_FIRST.equalsIgnoreCase(completion)) {
if (!subShell.isEmpty()) {
List<Completer> completers = new ArrayList<Completer>();
for (String name : allCompleters[1].keySet()) {
- if (name.startsWith(subShell)) {
+ if (name.startsWith(subShell + ":")) {
completers.add(allCompleters[1].get(name));
}
}