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

StubOnly -> Stub, for all different classes

Browse Source
This commit is contained in:
Dave Halter
2019-05-05 20:46:45 +02:00
parent 9af8638589
commit 7c385f72a1
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/api/classes.py
View File

@@ -15,7 +15,7 @@ from jedi.evaluate import compiled
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.typeshed import StubModuleContext
from jedi.evaluate.gradual.stub_context import name_to_stub, stub_to_actual_context_set
from jedi.api.keywords import KeywordName
@@ -207,7 +207,7 @@ class BaseDefinition(object):
def in_builtin_module(self):
"""Whether this is a builtin module."""
if isinstance(self._module, StubOnlyModuleContext):
if isinstance(self._module, StubModuleContext):
return any(isinstance(context, compiled.CompiledObject)
for context in self._module.non_stub_context_set)
return isinstance(self._module, compiled.CompiledObject)

6
jedi/evaluate/context/module.py
View File

@@ -1,10 +1,8 @@
import re
import os
from parso import python_bytes_to_unicode
from jedi.evaluate.cache import evaluator_method_cache
from jedi._compatibility import iter_modules, all_suffixes
from jedi._compatibility import iter_modules
from jedi.evaluate.filters import GlobalNameFilter, ContextNameMixin, \
AbstractNameDefinition, ParserTreeFilter, DictFilter, MergedFilter
from jedi.evaluate import compiled
@@ -170,7 +168,7 @@ class ModuleContext(ModuleMixin, TreeContext):
if self._path is not None and self._path.endswith('.pyi'):
# Currently this is the way how we identify stubs when e.g. goto is
# used in them. This could be changed if stubs would be identified
# sooner and used as StubOnlyModuleContext.
# sooner and used as StubModuleContext.
return True
return super(ModuleContext, self).is_stub()

32
jedi/evaluate/gradual/stub_context.py
View File

@@ -10,14 +10,14 @@ from jedi.evaluate.utils import to_list
from jedi.evaluate.gradual.typing import TypingModuleFilterWrapper, AnnotatedClass
class _StubOnlyContextMixin(object):
class _StubContextMixin(object):
_add_non_stubs_in_filter = False
def is_stub(self):
return True
def _get_stub_only_filters(self, **filter_kwargs):
return [StubOnlyFilter(
return [StubFilter(
self.evaluator,
context=self,
**filter_kwargs
@@ -38,11 +38,11 @@ class _StubOnlyContextMixin(object):
yield f
class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext):
class StubModuleContext(_StubContextMixin, ModuleContext):
_add_non_stubs_in_filter = True
def __init__(self, non_stub_context_set, *args, **kwargs):
super(StubOnlyModuleContext, self).__init__(*args, **kwargs)
super(StubModuleContext, self).__init__(*args, **kwargs)
self.non_stub_context_set = non_stub_context_set
def _get_first_non_stub_filters(self):
@@ -50,7 +50,7 @@ class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext):
yield next(context.get_filters(search_global=False))
def _get_stub_only_filters(self, search_global, **filter_kwargs):
stub_filters = super(StubOnlyModuleContext, self)._get_stub_only_filters(
stub_filters = super(StubModuleContext, self)._get_stub_only_filters(
search_global=search_global, **filter_kwargs
)
stub_filters += self.iter_star_filters(search_global=search_global)
@@ -58,7 +58,7 @@ class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext):
def get_filters(self, search_global=False, until_position=None,
origin_scope=None, **kwargs):
filters = super(StubOnlyModuleContext, self).get_filters(
filters = super(StubModuleContext, self).get_filters(
search_global, until_position, origin_scope, **kwargs
)
for f in self._get_base_filters(filters, search_global, until_position, origin_scope):
@@ -74,11 +74,11 @@ class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext):
return []
class StubOnlyClass(_StubOnlyContextMixin, ClassMixin, ContextWrapper):
class StubClass(_StubContextMixin, ClassMixin, ContextWrapper):
pass
class TypingModuleWrapper(StubOnlyModuleContext):
class TypingModuleWrapper(StubModuleContext):
def get_filters(self, *args, **kwargs):
filters = super(TypingModuleWrapper, self).get_filters(*args, **kwargs)
yield TypingModuleFilterWrapper(next(filters))
@@ -123,7 +123,7 @@ def stub_to_actual_context_set(stub_context, ignore_compiled=False):
if qualified_names is None:
return NO_CONTEXTS
assert isinstance(stub_module, StubOnlyModuleContext), stub_module
assert isinstance(stub_module, StubModuleContext), stub_module
non_stubs = stub_module.non_stub_context_set
if ignore_compiled:
non_stubs = non_stubs.filter(lambda c: not c.is_compiled())
@@ -237,27 +237,27 @@ def to_stub(context):
return stub_contexts
class StubOnlyName(TreeNameDefinition):
class _StubName(TreeNameDefinition):
def infer(self):
inferred = super(StubOnlyName, self).infer()
inferred = super(_StubName, self).infer()
if self.string_name == 'version_info' and self.get_root_context().py__name__() == 'sys':
return [VersionInfo(c) for c in inferred]
return [
StubOnlyClass.create_cached(c.evaluator, c) if isinstance(c, ClassContext) else c
StubClass.create_cached(c.evaluator, c) if isinstance(c, ClassContext) else c
for c in inferred
]
class StubOnlyFilter(ParserTreeFilter):
name_class = StubOnlyName
class StubFilter(ParserTreeFilter):
name_class = _StubName
def __init__(self, *args, **kwargs):
self._search_global = kwargs.pop('search_global') # Python 2 :/
super(StubOnlyFilter, self).__init__(*args, **kwargs)
super(StubFilter, self).__init__(*args, **kwargs)
def _is_name_reachable(self, name):
if not super(StubOnlyFilter, self)._is_name_reachable(name):
if not super(StubFilter, self)._is_name_reachable(name):
return False
if not self._search_global:

6
jedi/evaluate/gradual/typeshed.py
View File

@@ -6,7 +6,7 @@ from jedi._compatibility import FileNotFoundError
from jedi.parser_utils import get_cached_code_lines
from jedi.evaluate.cache import evaluator_function_cache
from jedi.evaluate.base_context import ContextSet
from jedi.evaluate.gradual.stub_context import TypingModuleWrapper, StubOnlyModuleContext
from jedi.evaluate.gradual.stub_context import TypingModuleWrapper, StubModuleContext
_jedi_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
TYPESHED_PATH = os.path.join(_jedi_path, 'third_party', 'typeshed')
@@ -124,7 +124,7 @@ def _try_to_load_stub(evaluator, actual_context_set, parent_module_context, impo
map_ = None
if len(import_names) == 1:
map_ = _cache_stub_file_map(evaluator.grammar.version_info)
elif isinstance(parent_module_context, StubOnlyModuleContext):
elif isinstance(parent_module_context, StubModuleContext):
if not parent_module_context.is_package:
# Only if it's a package (= a folder) something can be
# imported.
@@ -156,7 +156,7 @@ def create_stub_module(evaluator, actual_context_set, stub_module_node, path, im
if import_names == ('typing',):
module_cls = TypingModuleWrapper
else:
module_cls = StubOnlyModuleContext
module_cls = StubModuleContext
file_name = os.path.basename(path)
stub_module_context = module_cls(
actual_context_set, evaluator, stub_module_node,