Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

fix tab completion

Browse Source
This commit is contained in:
William Ting 2013-05-14 22:53:07 -05:00
parent 3b8231c0b2
commit a489a8de70
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/autojump
View File

@ -199,7 +199,7 @@ class Database:
def set_defaults(): def set_defaults():
config = {} config = {}
config['version'] = 'release-v21.6.5' config['version'] = 'release-v21.6.6'
config['max_paths'] = 1000 config['max_paths'] = 1000
config['separator'] = '__' config['separator'] = '__'
config['home'] = os.path.expanduser('HOME') config['home'] = os.path.expanduser('HOME')
@ -468,16 +468,18 @@ def main():
# check for tab completion # check for tab completion
tab_choice = None tab_choice = None
tab_match = re.search(sep+'([0-9]+)', patterns[-1]) tab_match = re.search(sep+r'([0-9]+)', patterns[-1])
# user has selected a tab completion entry # user has selected a tab completion entry
if tab_match: if tab_match:
config['match_cnt'] = 9
tab_choice = int(tab_match.group(1)) tab_choice = int(tab_match.group(1))
patterns[-1] = re.sub(sep+'[0-9]+.*', '', patterns[-1]) patterns[-1] = re.sub(sep+r'[0-9]+.*', '', patterns[-1])
# user hasn't selected a tab completion, display choices again # user hasn't selected a tab completion, display choices again
else: else:
tab_match = re.match('(.*)'+sep, patterns[-1]) tab_match = re.match(r'(.*)'+sep, patterns[-1])
if tab_match: if tab_match:
config['match_cnt'] = 9
patterns[-1] = tab_match.group(1) patterns[-1] = tab_match.group(1)
results = find_matches(config, db, patterns, results = find_matches(config, db, patterns,
@ -496,7 +498,7 @@ def main():
output_quotes(config, results[tab_choice-1]) output_quotes(config, results[tab_choice-1])
elif len(results) > 1 and config['args'].complete: elif len(results) > 1 and config['args'].complete:
for n, r in enumerate(results[:9]): for n, r in enumerate(results[:9]):
output_quotes(config, '%s%s%d%s%s\n' % (patterns[-1], sep, n+1, output_quotes(config, '%s%s%d%s%s' % (patterns[-1], sep, n+1,
sep, r)) sep, r))
elif results: elif results:
output_quotes(config, results[0]) output_quotes(config, results[0])