VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Merge branch 'feature_827_fuzzy_search' of https://github.com/jmfrank63/jedi

Browse Source
This commit is contained in:
Dave Halter
2019-12-15 19:08:33 +01:00
parent 0ce414eb94 364a527fd9
commit ec2391c74f
8 changed files with 102 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jedi/api/completion.py
View File

@@ -28,7 +28,7 @@ def get_call_signature_param_names(call_signatures):
yield p._name
def filter_names(inference_state, completion_names, stack, like_name):
def filter_names(inference_state, completion_names, stack, like_name, fuzzy):
comp_dct = {}
if settings.case_insensitive_completion:
like_name = like_name.lower()
@@ -36,8 +36,11 @@ def filter_names(inference_state, completion_names, stack, like_name):
string = name.string_name
if settings.case_insensitive_completion:
string = string.lower()
if string.startswith(like_name):
if fuzzy:
match = helpers.fuzzy_match(string, like_name)
else:
match = helpers.start_match(string, like_name)
if match:
new = classes.Completion(
inference_state,
name,
@@ -70,7 +73,7 @@ def get_flow_scope_node(module_node, position):
class Completion:
def __init__(self, inference_state, module_context, code_lines, position,
call_signatures_callback):
call_signatures_callback, fuzzy=False):
self._inference_state = inference_state
self._module_context = module_context
self._module_node = module_context.tree_node
@@ -84,14 +87,20 @@ class Completion:
self._position = position[0], position[1] - len(self._like_name)
self._call_signatures_callback = call_signatures_callback
def completions(self):
self._fuzzy = fuzzy
def completions(self, fuzzy=False, **kwargs):
return self._completions(fuzzy, **kwargs)
def _completions(self, fuzzy):
leaf = self._module_node.get_leaf_for_position(self._position, include_prefixes=True)
string, start_leaf = _extract_string_while_in_string(leaf, self._position)
if string is not None:
completions = list(file_name_completions(
self._inference_state, self._module_context, start_leaf, string,
self._like_name, self._call_signatures_callback,
self._code_lines, self._original_position
self._code_lines, self._original_position,
fuzzy
))
if completions:
return completions
@@ -99,7 +108,7 @@ class Completion:
completion_names = self._get_value_completions(leaf)
completions = filter_names(self._inference_state, completion_names,
self.stack, self._like_name)
self.stack, self._like_name, fuzzy)
return sorted(completions, key=lambda x: (x.name.startswith('__'),
x.name.startswith('_'),