VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-28 22:22:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

start_pos is usually not needed to search in modules, but if we generalize that, things get a lot slower - tests still pass - but the slowness is probably due to some weird recursion catching that now happens and that Jedi runs into, e.g. check ./run.py std 27 --debug

Browse Source
This commit is contained in:
Dave Halter
2014-03-10 00:40:57 +01:00
parent a073b902c1
commit cc667e76dc
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/__init__.py
View File

@@ -124,11 +124,19 @@ class Evaluator(object):
result = self.eval_expression_list(expression_list) result = self.eval_expression_list(expression_list)
# Assignment checking is only important if the statement defines multiple ass_details = stmt.assignment_details
# variables. if ass_details and ass_details[0][1] != '=' and False:
if len(stmt.get_set_vars()) > 1 and seek_name and stmt.assignment_details: expr_list, operator = ass_details[0]
name = str(expr_list[0].name)
start_pos = stmt.start_pos[0] - 1, stmt.start_pos[1] + 30000
left_result = self.find_types(stmt.parent, name, start_pos)
# `=` is always the last character in aug assignments
result = precedence.calculate(left_result, operator[:-1], result)
elif len(stmt.get_set_vars()) > 1 and seek_name and ass_details:
# Assignment checking is only important if the statement defines
# multiple variables.
new_result = [] new_result = []
for ass_expression_list, op in stmt.assignment_details: for ass_expression_list, op in ass_details:
new_result += finder.find_assignments(ass_expression_list[0], result, seek_name) new_result += finder.find_assignments(ass_expression_list[0], result, seek_name)
result = new_result result = new_result
return set(result) return set(result)
@@ -277,7 +285,7 @@ class Evaluator(object):
# This is the typical lookup while chaining things. # This is the typical lookup while chaining things.
if filter_private_variable(typ, scope, current): if filter_private_variable(typ, scope, current):
return [] return []
types = self.find_types(typ, current, position=position) types = self.find_types(typ, current, position=None)
result = imports.strip_imports(self, types) result = imports.strip_imports(self, types)
return self.follow_path(path, set(result), scope, position=position) return self.follow_path(path, set(result), scope, position=position)

2
jedi/evaluate/compiled/__init__.py
View File

@@ -279,6 +279,8 @@ class Builtin(CompiledObject):
# access it. # access it.
return [d for d in super(Builtin, self).get_defined_names() if d.name != 'None'] return [d for d in super(Builtin, self).get_defined_names() if d.name != 'None']
get_set_vars = get_defined_names
def _a_generator(foo): def _a_generator(foo):
"""Used to have an object to return for generators.""" """Used to have an object to return for generators."""

19
jedi/evaluate/finder.py
View File

@@ -24,7 +24,7 @@ class NameFinder(object):
def find(self, scopes, resolve_decorator=True): def find(self, scopes, resolve_decorator=True):
names = self.filter_name(scopes) names = self.filter_name(scopes)
types = self._names_to_types(names, resolve_decorator) types = self._names_to_types(names, resolve_decorator)
debug.dbg('_names_to_types: %s, old: %s', names, types) debug.dbg('finder._names_to_types: %s, old: %s', names, types)
return self._resolve_descriptors(types) return self._resolve_descriptors(types)
def scopes(self, search_global=False): def scopes(self, search_global=False):
@@ -34,7 +34,7 @@ class NameFinder(object):
if isinstance(self.scope, er.Instance): if isinstance(self.scope, er.Instance):
return self.scope.scope_generator() return self.scope.scope_generator()
else: else:
if isinstance(self.scope, (er.Class, pr.Module)): if isinstance(self.scope, er.Class):
# classes are only available directly via chaining? # classes are only available directly via chaining?
# strange stuff... # strange stuff...
names = self.scope.get_defined_names() names = self.scope.get_defined_names()
@@ -78,7 +78,7 @@ class NameFinder(object):
new_name.parent = r new_name.parent = r
result.append(new_name) result.append(new_name)
debug.dbg('sfn filter "%s" in (%s-%s): %s@%s', self.name_str, debug.dbg('finder.filter_name "%s" in (%s-%s): %s@%s', self.name_str,
self.scope, nscope, u(result), self.position) self.scope, nscope, u(result), self.position)
return result return result
@@ -105,12 +105,7 @@ class NameFinder(object):
""" """
par = name.parent par = name.parent
if par.isinstance(pr.Statement): if par.isinstance(pr.Statement):
details = par.assignment_details if isinstance(name, er.InstanceElement) and not name.is_class_var:
if details and details[0][1] != '=':
return True
if isinstance(name, er.InstanceElement) \
and not name.is_class_var:
return True return True
elif isinstance(par, pr.Import) and len(par.namespace) > 1: elif isinstance(par, pr.Import) and len(par.namespace) > 1:
# TODO multi-level import non-breakable # TODO multi-level import non-breakable
@@ -351,9 +346,9 @@ def _get_defined_names_for_position(scope, position=None, start_scope=None):
names = scope.get_defined_names() names = scope.get_defined_names()
# Instances have special rules, always return all the possible completions, # Instances have special rules, always return all the possible completions,
# because class variables are always valid and the `self.` variables, too. # because class variables are always valid and the `self.` variables, too.
if (not position or isinstance(scope, (iterable.Array, er.Instance)) if not position or isinstance(scope, (iterable.Array, er.Instance, compiled.CompiledObject)) \
or start_scope != scope or start_scope != scope \
and isinstance(start_scope, (pr.Function, er.FunctionExecution))): and isinstance(start_scope, (pr.Function, er.FunctionExecution)):
return names return names
names_new = [] names_new = []
for n in names: for n in names: