You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/07/19 08:08:59 UTC

karaf git commit: [KARAF-4372] Content assist for paths does not work correctly

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 3827fb998 -> f27665b10


[KARAF-4372] Content assist for paths does not work correctly

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f27665b1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f27665b1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f27665b1

Branch: refs/heads/karaf-4.0.x
Commit: f27665b1080deb4416561e8dfe736948337c17e8
Parents: 3827fb9
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Jul 19 10:08:45 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Jul 19 10:08:45 2016 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/f27665b1/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index 4476211..6e34bd3 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -39,6 +39,7 @@ import java.util.regex.Pattern;
 
 import jline.UnsupportedTerminal;
 import jline.console.ConsoleReader;
+import jline.console.completer.CandidateListCompletionHandler;
 import jline.console.history.MemoryHistory;
 import jline.console.history.PersistentHistory;
 import org.apache.felix.service.command.CommandProcessor;
@@ -121,6 +122,9 @@ public class ConsoleSessionImpl implements Session {
                     out,
                     terminal instanceof JLineTerminal ? ((JLineTerminal) terminal).getTerminal() : new KarafTerminal(terminal),
                     encoding);
+            CandidateListCompletionHandler handler = new CandidateListCompletionHandler();
+            handler.setPrintSpaceAfterFullCompletion(false);
+            reader.setCompletionHandler(handler);
         } catch (IOException e) {
             throw new RuntimeException("Error opening console reader", e);
         }