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

get_definition has now a new option.

Browse Source
This commit is contained in:
Dave Halter
2017-09-02 23:56:00 +02:00
parent 747e0aa7c4
commit 333babea39
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/__init__.py
View File

@@ -444,7 +444,7 @@ class Evaluator(object):
return types return types
def goto_definitions(self, context, name): def goto_definitions(self, context, name):
def_ = name._get_definition() def_ = name._get_definition(import_name_always=True)
if def_ is not None: if def_ is not None:
type_ = def_.type type_ = def_.type
if type_ == 'classdef': if type_ == 'classdef':
@@ -464,15 +464,12 @@ class Evaluator(object):
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:
imp = tree.search_ancestor(name, 'import_from', 'import_name')
if imp is not None:
return imports.infer_import(context, name)
return helpers.evaluate_call_of_leaf(context, name) return helpers.evaluate_call_of_leaf(context, name)
def goto(self, context, name): def goto(self, context, name):
stmt = name.get_definition() definition = name._get_definition(import_name_always=True)
par = name.parent par = name.parent
typ = par.type typ = par.type
if typ == 'argument' and par.children[1] == '=' and par.children[0] == name: if typ == 'argument' and par.children[1] == '=' and par.children[0] == name:
@@ -508,7 +505,7 @@ class Evaluator(object):
return [ParamName(context, name)] return [ParamName(context, name)]
elif typ in ('param', 'funcdef', 'classdef') and par.name is name: elif typ in ('param', 'funcdef', 'classdef') and par.name is name:
return [TreeNameDefinition(context, name)] return [TreeNameDefinition(context, name)]
elif isinstance(stmt, tree.Import): elif isinstance(definition, tree.Import):
module_names = imports.infer_import(context, name, is_goto=True) module_names = imports.infer_import(context, name, is_goto=True)
return module_names return module_names
elif typ == 'dotted_name': # Is a decorator. elif typ == 'dotted_name': # Is a decorator.
@@ -529,9 +526,10 @@ class Evaluator(object):
for value in values for value in values
) )
else: else:
if stmt.type != 'expr_stmt': stmt = tree.search_ancestor(
# We only need to adjust the start_pos for statements, because name, 'expr_stmt', 'lambdef'
# there the name cannot be used. ) or name
if stmt.type == 'lambdef':
stmt = name stmt = name
return context.py__getattribute__( return context.py__getattribute__(
name, name,