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

Remove stubify

Browse Source
This commit is contained in:
Dave Halter
2019-05-05 16:02:18 +02:00
parent 73aca23615
commit 87fd56859d
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+2 -6
View File
@@ -86,7 +86,7 @@ from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \
eval_node, check_tuple_assignments eval_node, check_tuple_assignments
from jedi.evaluate.gradual.stub_context import with_stub_context_if_possible, \ from jedi.evaluate.gradual.stub_context import with_stub_context_if_possible, \
stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub, \ stub_to_actual_context_set, goto_with_stubs_if_possible, goto_non_stub, \
stubify, load_stubs load_stubs
def _execute(context, arguments): def _execute(context, arguments):
@@ -446,7 +446,6 @@ class Evaluator(object):
self, parent_context.parent_context, parent_context) self, parent_context.parent_context, parent_context)
func = FunctionContext.from_context(parent_context, scope_node) func = FunctionContext.from_context(parent_context, scope_node)
func = next(iter(stubify(parent_context, func)))
if parent_was_class: if parent_was_class:
func = BoundMethod( func = BoundMethod(
@@ -457,10 +456,7 @@ class Evaluator(object):
return func.get_function_execution() return func.get_function_execution()
return func return func
elif scope_node.type == 'classdef': elif scope_node.type == 'classdef':
return next(iter(stubify( return ClassContext(self, parent_context, scope_node)
parent_context,
ClassContext(self, parent_context, scope_node)
)))
elif scope_node.type == 'comp_for': elif scope_node.type == 'comp_for':
if node.start_pos >= scope_node.children[-1].start_pos: if node.start_pos >= scope_node.children[-1].start_pos:
return parent_context return parent_context
jedi/evaluate/gradual/stub_context.py
-13
View File
@@ -368,19 +368,6 @@ def try_stub_to_actual_names(names, prefer_stub_to_compiled=False):
yield name yield name
def stubify(parent_context, context):
if parent_context.is_stub():
return ContextSet([context])
# XXX
return ContextSet(
c.stub_context
for c in stub_to_actual_context_set(context)
if c.stub_context is not None
) or ContextSet([context])
else:
return with_stub_context_if_possible(context)
def _load_or_get_stub_module(evaluator, names): def _load_or_get_stub_module(evaluator, names):
return evaluator.stub_module_cache.get(names) return evaluator.stub_module_cache.get(names)