From 1b8c4804bade4be3e89199dfb2624469d6fc54c4 Mon Sep 17 00:00:00 2001 From: adam j hartz Date: Tue, 31 May 2016 16:45:50 -0400 Subject: [PATCH] try to get cdpath right --- xonsh/completers/base.py | 2 +- xonsh/completers/dirs.py | 4 ++-- xonsh/completers/path.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xonsh/completers/base.py b/xonsh/completers/base.py index e4e03cb4c..6b8100a44 100644 --- a/xonsh/completers/base.py +++ b/xonsh/completers/base.py @@ -8,7 +8,7 @@ def complete_base(prefix, line, start, end, ctx): if line.strip() == '': out = (complete_python(prefix, line, start, end, ctx) | complete_command(prefix, line, start, end, ctx)) - paths = complete_path(prefix, line, start, end, ctx) + paths = complete_path(prefix, line, start, end, ctx, False) return (out | paths[0]), paths[1] elif prefix == line: return (complete_python(prefix, line, start, end, ctx) | diff --git a/xonsh/completers/dirs.py b/xonsh/completers/dirs.py index c452ed4fe..571076749 100644 --- a/xonsh/completers/dirs.py +++ b/xonsh/completers/dirs.py @@ -7,11 +7,11 @@ PREVENT_OTHERS = ['path'] def complete_cd(prefix, line, start, end, ctx): if start != 0 and line.split(' ')[0] == 'cd': - return complete_dir(prefix, line, start, end, ctx) + return complete_dir(prefix, line, start, end, ctx, True) return set() def complete_rmdir(prefix, line, start, end, ctx): if start != 0 and line.split(' ')[0] == 'rmdir': - return complete_dir(prefix, line, start, end, ctx) + return complete_dir(prefix, line, start, end, ctx, True) return set() diff --git a/xonsh/completers/path.py b/xonsh/completers/path.py index defbd21a7..fb73dd817 100644 --- a/xonsh/completers/path.py +++ b/xonsh/completers/path.py @@ -150,7 +150,7 @@ def _quote_paths(paths, start, end): return out -def complete_path(prefix, line, start, end, ctx, cdpath=False): +def complete_path(prefix, line, start, end, ctx, cdpath=True): """Completes based on a path name.""" # string stuff for automatic quoting path_str_start = ''