1
0
forked from VimPlug/jedi

Remove more unused code that was used for goto a long time ago

This commit is contained in:
Dave Halter
2019-05-10 01:11:09 +02:00
parent eb07c0b4cf
commit 1430ac2675
3 changed files with 4 additions and 30 deletions

View File

@@ -16,8 +16,7 @@ from jedi.evaluate.imports import ImportName
from jedi.evaluate.names import ParamName
from jedi.evaluate.context import FunctionExecutionContext, MethodContext
from jedi.evaluate.gradual.typeshed import StubModuleContext
from jedi.evaluate.gradual.stub_context import name_to_stub, \
stub_to_actual_context_set, try_stub_to_actual_names
from jedi.evaluate.gradual.stub_context import name_to_stub, stub_to_actual_context_set
from jedi.api.keywords import KeywordName

View File

@@ -84,9 +84,8 @@ from jedi.evaluate.context import ClassContext, FunctionContext, \
from jedi.evaluate.context.iterable import CompForContext
from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \
eval_node, check_tuple_assignments
from jedi.evaluate.gradual.stub_context import \
stub_to_actual_context_set, goto_with_stubs_if_possible, \
try_stub_to_actual_names
from jedi.evaluate.gradual.stub_context import try_stub_to_actual_names, \
stub_to_actual_context_set
def _execute(context, arguments):
@@ -340,8 +339,7 @@ class Evaluator(object):
elif type_ == 'param':
return [ParamName(context, name)]
elif type_ in ('funcdef', 'classdef'):
n = TreeNameDefinition(context, name)
return goto_with_stubs_if_possible(n)
return [TreeNameDefinition(context, name)]
elif type_ in ('import_from', 'import_name'):
module_names = imports.infer_import(context, name, is_goto=True)
return module_names

View File

@@ -90,29 +90,6 @@ class TypingModuleWrapper(StubModuleContext):
yield f
def goto_with_stubs_if_possible(name):
return [name]
# XXX
root = name.parent_context.get_root_context()
stub = root.get_root_context().stub_context
if stub is None:
return [name]
qualified_names = name.parent_context.get_qualified_names()
if qualified_names is None:
return [name]
stub_contexts = ContextSet([stub])
for n in qualified_names:
stub_contexts = stub_contexts.py__getattribute__(n)
names = stub_contexts.py__getattribute__(name.string_name, is_goto=True)
return [
n
for n in names
if n.start_pos == name.start_pos and n.parent_context == name.parent_context
] or [name]
def stub_to_actual_context_set(stub_context, ignore_compiled=False):
stub_module = stub_context.get_root_context()
if not stub_module.is_stub():