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

Actually use the stub function

Browse Source
This commit is contained in:
Dave Halter
2018-08-01 01:42:09 +02:00
parent dfbd1f8772
commit c196075cb8
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
jedi/plugins/typeshed.py
View File

@@ -99,7 +99,7 @@ class TypeshedPlugin(BasePlugin):
evaluator, evaluator,
import_names, import_names,
parent_module_context.actual_context # noqa parent_module_context.actual_context # noqa
if isinstance(parent_module_context, ModuleStubProxy) if isinstance(parent_module_context, ModuleStubContext)
else parent_module_context, else parent_module_context,
sys_path sys_path
) )
@@ -107,7 +107,7 @@ class TypeshedPlugin(BasePlugin):
map_ = None map_ = None
if len(import_names) == 1 and import_name != 'typing': if len(import_names) == 1 and import_name != 'typing':
map_ = self._cache_stub_file_map(evaluator.grammar.version_info) map_ = self._cache_stub_file_map(evaluator.grammar.version_info)
elif isinstance(parent_module_context, ModuleStubProxy): elif isinstance(parent_module_context, ModuleStubContext):
map_ = _merge_create_stub_map(parent_module_context.py__path__()) map_ = _merge_create_stub_map(parent_module_context.py__path__())
if map_ is not None: if map_ is not None:
@@ -133,7 +133,7 @@ class TypeshedPlugin(BasePlugin):
# merge the actual module contexts with stubs. # merge the actual module contexts with stubs.
return ModuleContext(*args) return ModuleContext(*args)
return ContextSet.from_iterable( return ContextSet.from_iterable(
ModuleStubProxy( ModuleStubContext(
*args, *args,
context, context,
parent_module_context, parent_module_context,
@@ -157,13 +157,24 @@ class StubName(TreeNameDefinition):
self._stub_tree_name = stub_tree_name self._stub_tree_name = stub_tree_name
def infer(self): def infer(self):
# The position and everything should come from the actual position def iterate(contexts):
# (not the stub), but everything else for c in contexts:
return tree_name_to_contexts( if isinstance(c, FunctionContext):
yield FunctionStubContext(
c.evaluator,
c.parent_context,
c.tree_node,
)
else:
yield c
contexts = tree_name_to_contexts(
self.parent_context.evaluator, self.parent_context.evaluator,
self._stub_parent_context, self._stub_parent_context,
self._stub_tree_name self._stub_tree_name
) )
return ContextSet.from_iterable(iterate(contexts))
class StubParserTreeFilter(ParserTreeFilter): class StubParserTreeFilter(ParserTreeFilter):
@@ -250,15 +261,15 @@ class StubProxy(object):
return '<%s: %s>' % (type(self).__name__, self._stub_context) return '<%s: %s>' % (type(self).__name__, self._stub_context)
class ModuleStubProxy(ModuleContext): class ModuleStubContext(ModuleContext):
def __init__(self, evaluator, stub_module_node, path, code_lines, def __init__(self, evaluator, stub_module_node, path, code_lines,
actual_context, parent_module_context): actual_context, parent_module_context):
super(ModuleStubProxy, self).__init__(evaluator, stub_module_node, path, code_lines), super(ModuleStubContext, self).__init__(evaluator, stub_module_node, path, code_lines),
self._parent_module_context = parent_module_context self._parent_module_context = parent_module_context
self.actual_context = actual_context self.actual_context = actual_context
def get_filters(self, search_global, until_position=None, origin_scope=None): def get_filters(self, search_global, until_position=None, origin_scope=None):
filters = super(ModuleStubProxy, self).get_filters( filters = super(ModuleStubContext, self).get_filters(
search_global, until_position, origin_scope search_global, until_position, origin_scope
) )
yield StubParserTreeFilter( yield StubParserTreeFilter(
@@ -275,9 +286,9 @@ class ModuleStubProxy(ModuleContext):
yield f yield f
class ClassStubProxy(ClassContext): class ClassStubContext(ClassContext):
pass pass
class FunctionStubProxy(FunctionContext): class FunctionStubContext(FunctionContext):
pass pass

28
test/test_plugin/test_stub.py
View File

@@ -3,6 +3,8 @@ import os
from jedi.plugins import typeshed from jedi.plugins import typeshed
from parso.utils import PythonVersionInfo from parso.utils import PythonVersionInfo
TYPESHED_PYTHON3 = os.path.join(typeshed._TYPESHED_PATH, 'stdlib', '3')
def test_get_typeshed_directories(): def test_get_typeshed_directories():
def get_dirs(version_info): def get_dirs(version_info):
@@ -30,6 +32,26 @@ def test_get_stub_files():
def get_map(version_info): def get_map(version_info):
return typeshed._create_stub_map(version_info) return typeshed._create_stub_map(version_info)
base = os.path.join(typeshed._TYPESHED_PATH, 'stdlib', '3') map_ = typeshed._create_stub_map(TYPESHED_PYTHON3)
map_ = typeshed._create_stub_map(base) assert map_['functools'] == os.path.join(TYPESHED_PYTHON3, 'functools.pyi')
assert map_['functools'] == os.path.join(base, 'functools.pyi')
def test_function(Script):
s = Script('import threading; threading.current_thread')
def_, = s.goto_definitions()
context = def_._name._context
assert isinstance(context, typeshed.FunctionStubContext), context
def test_class(Script):
s = Script('import threading; threading.Lock')
def test_instance(Script):
s = Script('import threading; threading.Lock()')
def test_method(Script):
s = Script('import threading; threading.Lock().locked')