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

Change the way paths are added to the bash completions. Now the path are only added if a canonical duplicate exist in the completions from bash

Browse source
This commit is contained in:
Morten Enemark Lund 2016-05-24 10:52:14 +02:00
parent 36db1430eb
commit 82a8543156
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xonsh/completer.py
View file

@ -192,9 +192,9 @@ class Completer(object):
rtn = self.cmd_complete(prefix) rtn = self.cmd_complete(prefix)
elif cmd in self.bash_complete_funcs: elif cmd in self.bash_complete_funcs:
# bash completions # bash completions
rtn = self.bash_complete(prefix, line, begidx, endidx) comps = self.bash_complete(prefix, line, begidx, endidx)
rtn |= self.path_complete(prefix, path_str_start, path_str_end) pathcomp = self.path_complete(prefix, path_str_start, path_str_end)
return sorted(self._filter_repeats(rtn)), lprefix return sorted(self._replace_canonical_rep(comps, pathcomp)), lprefix
elif prefix.startswith('${') or prefix.startswith('@('): elif prefix.startswith('${') or prefix.startswith('@('):
# python mode explicitly # python mode explicitly
return self._python_mode_completions(prefix, ctx, return self._python_mode_completions(prefix, ctx,
@ -270,6 +270,20 @@ class Completer(object):
reps[canon].append(comp) reps[canon].append(comp)
return {max(i, key=len) for i in reps.values()} return {max(i, key=len) for i in reps.values()}
def _replace_canonical_rep(self, comps, replacements):
""" Replaces any entries in comps with its cononical duplicate
from replacements
"""
replacements = {self._canonical_rep(v):v for v in replacements}
rtn = set()
for comp in comps:
canon = self._canonical_rep(comp)
if canon in replacements:
rtn.add(replacements[canon])
else:
rtn.add(comp)
return rtn
def find_and_complete(self, line, idx, ctx=None): def find_and_complete(self, line, idx, ctx=None):
"""Finds the completions given only the full code line and a current """Finds the completions given only the full code line and a current
cursor position. This represents an easier alternative to the cursor position. This represents an easier alternative to the