VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-05 08:17:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor things so goto is working in both directions

Browse Source
This commit is contained in:
Dave Halter
2019-05-05 01:16:40 +02:00
parent df9c9d8dff
commit 4d3a698a12
8 changed files with 95 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/__init__.py
View File

@@ -39,6 +39,8 @@ from jedi.evaluate.context import ModuleContext
from jedi.evaluate.base_context import ContextSet
from jedi.evaluate.context.iterable import unpack_tuple_to_dict
#from jedi.evaluate.gradual.typeshed import try_to_merge_with_stub
from jedi.evaluate.gradual.stub_context import try_stubs_to_actual_context_set, \
try_stubs_to_actual_names
from jedi.evaluate.gradual.utils import load_proper_stub_module
# Jedi uses lots and lots of recursion. By setting this a little bit higher, we
@@ -252,6 +254,8 @@ class Script(object):
context = self._evaluator.create_context(self._get_module(), leaf)
definitions = helpers.evaluate_goto_definition(self._evaluator, context, leaf)
# We don't want stubs here we want the actual contexts, if possible.
definitions = try_stubs_to_actual_context_set(definitions)
names = [s.name for s in definitions]
defs = [classes.Definition(self._evaluator, name) for name in names]
@@ -304,6 +308,7 @@ class Script(object):
return isinstance(name, imports.SubModuleName)
names = filter_follow_imports(names, check)
names = try_stubs_to_actual_names(names)
defs = [classes.Definition(self._evaluator, d) for d in set(names)]
return helpers.sorted_definitions(defs)

5
jedi/api/classes.py
View File

@@ -16,6 +16,7 @@ from jedi.evaluate.imports import ImportName
from jedi.evaluate.filters import ParamName
from jedi.evaluate.context import FunctionExecutionContext, MethodContext
from jedi.evaluate.gradual.typeshed import StubOnlyModuleContext
from jedi.evaluate.gradual.stub_context import name_to_stub
from jedi.api.keywords import KeywordName
@@ -310,8 +311,8 @@ class BaseDefinition(object):
return [self]
return [
Definition(self._evaluator, d.stub_context.name)
for d in self._name.infer() if d.stub_context is not None
Definition(self._evaluator, stub_def.name)
for stub_def in name_to_stub(self._name)
]
def goto_assignments(self):