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

fix the interpreter (previously broken by flow analysis)

Browse Source
This commit is contained in:
Dave Halter
2014-08-12 00:19:20 +02:00
parent 242072976a
commit 1865284fa9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/finder.py
+4 -4
View File
@@ -74,6 +74,9 @@ class NameFinder(object):
Filters all variables of a scope (which are defined in the Filters all variables of a scope (which are defined in the
`scope_names_generator`), until the name fits. `scope_names_generator`), until the name fits.
""" """
# TODO Now this import is really ugly. Try to remove it.
# It's possibly the only api dependency.
from jedi.api.interpreter import InterpreterNamespace
result = [] result = []
for name_list_scope, name_list in scope_names_generator: for name_list_scope, name_list in scope_names_generator:
break_scopes = [] break_scopes = []
@@ -94,11 +97,8 @@ class NameFinder(object):
# Exclude `arr[1] =` from the result set. # Exclude `arr[1] =` from the result set.
if not self._name_is_array_assignment(name): if not self._name_is_array_assignment(name):
if False:
result.append(name)
else:
if isinstance(stmt, (pr.Param, pr.Import)) \ if isinstance(stmt, (pr.Param, pr.Import)) \
or isinstance(name_list_scope, (pr.ListComprehension, er.Instance)) \ or isinstance(name_list_scope, (pr.ListComprehension, er.Instance, InterpreterNamespace)) \
or isinstance(scope, compiled.CompiledObject) \ or isinstance(scope, compiled.CompiledObject) \
or isinstance(stmt, pr.Statement) and stmt.is_global(): or isinstance(stmt, pr.Statement) and stmt.is_global():
# Always reachable. # Always reachable.