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

fix issues introduced with defined_names.

Browse Source
This commit is contained in:
Dave Halter
2014-07-02 11:01:42 +02:00
parent 3865c1a844
commit 789d48b7e3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/api/classes.py
View File

@@ -27,8 +27,14 @@ def defined_names(evaluator, scope):
:type scope: Scope :type scope: Scope
:rtype: list of Definition :rtype: list of Definition
""" """
pair = next(get_names_of_scope(evaluator, scope, star_search=False, # Calling get_names_of_scope doesn't make sense always. It might include
include_builtin=False), None) # star imports or inherited stuff. Wanted?
# TODO discuss!
if isinstance(scope, pr.Module):
pair = scope, scope.get_defined_names()
else:
pair = next(get_names_of_scope(evaluator, scope, star_search=False,
include_builtin=False), None)
names = pair[1] if pair else [] names = pair[1] if pair else []
names = [n for n in names if isinstance(n, pr.Import) or (len(n) == 1)] names = [n for n in names if isinstance(n, pr.Import) or (len(n) == 1)]
return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)] return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)]