mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also apply filtfunc to stuff we add after the quoting

Browse source
This commit is contained in:
Morten Enemark Lund 2016-06-17 13:55:21 +02:00
parent 0597c97d12
commit d458eb1a9a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xonsh/completers/path.py
View file

@ -80,12 +80,13 @@ def _startswithnorm(x, start, startlow=None):
return x.startswith(start)
def _add_env(paths, prefix):
def _env(prefix):
if prefix.startswith('$'):
key = prefix[1:]
paths.update({'$' + k
for k in builtins.__xonsh_env__
if get_filter_function()(k, key)})
return {'$' + k
for k in builtins.__xonsh_env__
if get_filter_function()(k, key)}
return ()
def _add_dots(paths, prefix):
@ -132,7 +133,7 @@ def _quote_paths(paths, start, end):
(backslash in s and slash != backslash))):
start = end = _quote_to_use(s)
if os.path.isdir(expand_path(s)):
_tail = slash
_tail = '' if s.endswith('/') else slash
elif end == '':
_tail = space
else:
@ -269,13 +270,12 @@ def complete_path(prefix, line, start, end, ctx, cdpath=True, filtfunc=None):
paths = {s.replace(home, tilde) for s in paths}
if cdpath:
_add_cdpaths(paths, prefix)
_add_env(paths, prefix)
_add_dots(paths, prefix)
if filtfunc is not None:
paths = {p for p in paths if filtfunc(p)}
paths = set(filter(filtfunc, paths))
paths = _quote_paths({_normpath(s) for s in paths},
path_str_start,
path_str_end)
paths.update(filter(filtfunc, _env(prefix)))
return paths, lprefix