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

moved global variables handling

Browse Source
This commit is contained in:
Dave Halter
2014-03-05 01:19:18 +01:00
parent 2322edff8f
commit 5f8f1e170b
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/finder.py
+23 -24
View File
@@ -148,9 +148,10 @@ class NameFinder(object):
types = [] types = []
# Add isinstance and other if/assert knowledge. # Add isinstance and other if/assert knowledge.
flow_scope = self.scope flow_scope = self.scope
evaluator = self._evaluator
while flow_scope: while flow_scope:
# TODO check if result is in scope -> no evaluation necessary # TODO check if result is in scope -> no evaluation necessary
n = check_flow_information(self._evaluator, flow_scope, n = check_flow_information(evaluator, flow_scope,
self.name_str, self.position) self.name_str, self.position)
if n: if n:
return n return n
@@ -163,12 +164,16 @@ class NameFinder(object):
elif isinstance(typ, pr.Param): elif isinstance(typ, pr.Param):
types += self._eval_param(typ) types += self._eval_param(typ)
elif typ.isinstance(pr.Statement): elif typ.isinstance(pr.Statement):
types += self._remove_statements(typ) if typ.is_global():
# global keyword handling.
types += evaluator.find_types(typ.parent.parent, str(name))
else:
types += self._remove_statements(typ)
else: else:
if isinstance(typ, pr.Class): if isinstance(typ, pr.Class):
typ = er.Class(self._evaluator, typ) typ = er.Class(evaluator, typ)
elif isinstance(typ, pr.Function): elif isinstance(typ, pr.Function):
typ = er.Function(self._evaluator, typ) typ = er.Function(evaluator, typ)
if typ.isinstance(er.Function) and resolve_decorator: if typ.isinstance(er.Function) and resolve_decorator:
typ = typ.get_decorated_func() typ = typ.get_decorated_func()
types.append(typ) types.append(typ)
@@ -183,29 +188,23 @@ class NameFinder(object):
""" """
evaluator = self._evaluator evaluator = self._evaluator
types = [] types = []
if stmt.is_global(): # Remove the statement docstr stuff for now, that has to be
# global keyword handling. # implemented with the evaluator class.
for token_name in stmt._token_list: #if stmt.docstr:
if isinstance(token_name, pr.Name): #res_new.append(stmt)
return evaluator.find_types(stmt.parent.parent, str(token_name))
else:
# Remove the statement docstr stuff for now, that has to be
# implemented with the evaluator class.
#if stmt.docstr:
#res_new.append(stmt)
check_instance = None check_instance = None
if isinstance(stmt, er.InstanceElement) and stmt.is_class_var: if isinstance(stmt, er.InstanceElement) and stmt.is_class_var:
check_instance = stmt.instance check_instance = stmt.instance
stmt = stmt.var stmt = stmt.var
types += evaluator.eval_statement(stmt, seek_name=self.name_str) types += evaluator.eval_statement(stmt, seek_name=self.name_str)
if check_instance is not None: if check_instance is not None:
# class renames # class renames
types = [er.InstanceElement(evaluator, check_instance, a, True) types = [er.InstanceElement(evaluator, check_instance, a, True)
if isinstance(a, (er.Function, pr.Function)) if isinstance(a, (er.Function, pr.Function))
else a for a in types] else a for a in types]
return types return types
def _eval_param(self, r): def _eval_param(self, r):