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

move completion wrap expression to separate function

Browse source
This commit is contained in:
Gil Forsyth 2015-12-05 12:37:56 -05:00
parent 72170c5f30
commit 09702594a1
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xonsh/completer.py
View file

@ -80,6 +80,18 @@ def _normpath(p):
return p
def completionwrap(s):
""" Returns the repr of input string s if that string contains
a 'problem' token that will confuse the xonsh parser
"""
space = ' '
slash = '/'
return (_normpath(repr(s + (slash if os.path.isdir(s) else '')))
if COMPLETION_WRAP_TOKENS.intersection(s) else
s + space
if s[-1:].isalnum() else
s)
class Completer(object):
"""This provides a list of optional completions for the xonsh shell."""
@ -317,13 +329,7 @@ class Completer(object):
except subprocess.CalledProcessError:
out = ''
space = ' '
slash = '/'
rtn = {_normpath(repr(s + (slash if os.path.isdir(s) else '')))
if COMPLETION_WRAP_TOKENS.intersection(s) else
s + space
if s[-1:].isalnum() else
s for s in out.splitlines()}
rtn = set(map(completionwrap, out.splitlines()))
return rtn
def _source_completions(self):