VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 14:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move some code around.

Browse Source
This commit is contained in:
Dave Halter
2017-09-02 22:45:23 +02:00
parent 9663e343c2
commit 4a04bf78c7
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
jedi/evaluate/__init__.py
View File

@@ -446,30 +446,30 @@ class Evaluator(object):
return types return types
def goto_definitions(self, context, name): def goto_definitions(self, context, name):
is_simple_name = name.parent.type not in ('power', 'trailer') def_ = name._get_definition()
if is_simple_name: if def_ is not None:
def_ = name._get_definition() type_ = def_.type
if def_ is not None: if type_ == 'classdef':
type_ = def_.type return [er.ClassContext(self, name.parent, context)]
if type_ == 'classdef': elif type_ == 'funcdef':
return [er.ClassContext(self, name.parent, context)] return [er.FunctionContext(self, context, name.parent)]
elif type_ == 'funcdef':
return [er.FunctionContext(self, context, name.parent)]
if type_ == 'expr_stmt': if type_ == 'expr_stmt':
is_simple_name = name.parent.type not in ('power', 'trailer')
if is_simple_name:
return self.eval_statement(context, def_, name) return self.eval_statement(context, def_, name)
if type_ == 'for_stmt': if type_ == 'for_stmt':
container_types = self.eval_element(context, def_.children[3]) container_types = self.eval_element(context, def_.children[3])
cn = ContextualizedNode(context, def_.children[3]) cn = ContextualizedNode(context, def_.children[3])
for_types = iterable.py__iter__types(self, container_types, cn) for_types = iterable.py__iter__types(self, container_types, cn)
c_node = ContextualizedName(context, name) c_node = ContextualizedName(context, name)
return finder.check_tuple_assignments(self, c_node, for_types) return finder.check_tuple_assignments(self, c_node, for_types)
if type_ in ('import_from', 'import_name'): if type_ in ('import_from', 'import_name'):
return imports.infer_import(context, name) return imports.infer_import(context, name)
else: else:
imp = tree.search_ancestor(name, 'import_from', 'import_name') imp = tree.search_ancestor(name, 'import_from', 'import_name')
if imp is not None: if imp is not None:
return imports.infer_import(context, name) return imports.infer_import(context, name)
return helpers.evaluate_call_of_leaf(context, name) return helpers.evaluate_call_of_leaf(context, name)