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

Merge 463ad780de into e8f3cbd874

Browse Source
This commit is contained in:
Calum Smith 2017-06-01 08:16:12 +00:00 committed by GitHub
commit 51b327cc75
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/autojump
View File

@ -193,8 +193,8 @@ def find_matches(entries, needles, check_entries=True):
lambda entry: not is_cwd(entry) and path_exists(entry), lambda entry: not is_cwd(entry) and path_exists(entry),
chain( chain(
match_consecutive(needles, data, ignore_case), match_consecutive(needles, data, ignore_case),
match_fuzzy(needles, data, ignore_case), match_anywhere(needles, data, ignore_case),
match_anywhere(needles, data, ignore_case))) match_fuzzy(needles, data, ignore_case)))
def handle_tab_completion(needle, entries): def handle_tab_completion(needle, entries):

11
bin/autojump_match.py
View File

@ -20,23 +20,26 @@ else:
def match_anywhere(needles, haystack, ignore_case=False): def match_anywhere(needles, haystack, ignore_case=False):
""" """
Matches needles anywhere in the path as long as they're in the same (but Matches needles anywhere in the path as long as they're in the same (but
not necessary consecutive) order. not necessary consecutive) order, and the last needle is at the end.
For example: For example:
needles = ['foo', 'baz'] needles = ['foo', 'baz']
regex needle = r'.*foo.*baz.*' regex needle = r'foo.*/.*baz[^/]*$'
haystack = [ haystack = [
(path='/foo/bar/baz', weight=10), (path='/foo/bar/baz', weight=10),
(path='/baz/foo/bar', weight=10), (path='/baz/foo/bar', weight=10),
(path='/foo/baz/bar', weight=11),
(path='/foo/baz', weight=10), (path='/foo/baz', weight=10),
] ]
result = [ result = [
(path='/moo/foo/baz', weight=10), (path='/foo/bar/baz', weight=10),
(path='/foo/baz', weight=10), (path='/foo/baz', weight=10),
] ]
""" """
regex_needle = '.*' + '.*'.join(imap(re.escape, needles)) + '.*' regex_some_seps = '.*' + os.sep + '.*'
regex_no_sep_end = '[^' + os.sep + ']*$'
regex_needle = regex_some_seps.join(imap(re.escape, needles)) + regex_no_sep_end
regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
found = lambda haystack: re.search( found = lambda haystack: re.search(
regex_needle, regex_needle,