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

Merge branch 'dev' into linter

Browse Source
This commit is contained in:
Dave Halter
2014-05-10 16:53:41 +02:00
parent ecfb3a0423 60971245d6
commit 11a445ab42
4 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/finder.py
View File

@@ -44,9 +44,11 @@ class NameFinder(object):
if search_global:
return get_names_of_scope(self._evaluator, self.scope, self.position)
else:
if isinstance(self.scope, er.Instance):
return self.scope.scope_generator()
else:
try:
# Use scope generators if parts of it (e.g. sub classes or star
# imports).
gen = self.scope.scope_names_generator
except AttributeError:
if isinstance(self.scope, er.Class):
# classes are only available directly via chaining?
# strange stuff...
@@ -54,14 +56,16 @@ class NameFinder(object):
else:
names = _get_defined_names_for_position(self.scope, self.position)
return iter([(self.scope, names)])
else:
return gen()
def filter_name(self, scope_generator):
def filter_name(self, scope_names_generator):
"""
Filters all variables of a scope (which are defined in the
`scope_generator`), until the name fits.
`scope_names_generator`), until the name fits.
"""
result = []
for nscope, name_list in scope_generator:
for nscope, name_list in scope_names_generator:
break_scopes = []
if not isinstance(nscope, compiled.CompiledObject):
# Here is the position stuff happening (sorting of variables).
@@ -448,7 +452,7 @@ def get_names_of_scope(evaluator, scope, position=None, star_search=True, includ
and scope.type() == 'class' and in_func_scope != scope):
try:
if isinstance(scope, er.Instance):
for g in scope.scope_generator():
for g in scope.scope_names_generator():
yield g
else:
yield scope, _get_defined_names_for_position(scope, position, in_func_scope)