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

Fix type completions on classes

Browse Source
This commit is contained in:
Dave Halter
2018-09-09 15:51:42 +02:00
parent 6abd96a398
commit bd3bd2e53b
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/base_context.py
View File

@@ -124,6 +124,8 @@ def iterate_contexts(contexts, contextualized_node=None, is_async=False):
class ContextWrapper(object): class ContextWrapper(object):
py__getattribute__ = Context.py__getattribute__
def __init__(self, wrapped_context): def __init__(self, wrapped_context):
self._wrapped_context = wrapped_context self._wrapped_context = wrapped_context

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

@@ -321,7 +321,7 @@ class CompiledObjectFilter(AbstractFilter):
def __init__(self, evaluator, compiled_object, is_instance=False): def __init__(self, evaluator, compiled_object, is_instance=False):
self._evaluator = evaluator self._evaluator = evaluator
self._compiled_object = compiled_object self._compiled_object = compiled_object
self._is_instance = is_instance self.is_instance = is_instance
def get(self, name): def get(self, name):
return self._get( return self._get(
@@ -345,7 +345,7 @@ class CompiledObjectFilter(AbstractFilter):
if is_descriptor or not has_attribute: if is_descriptor or not has_attribute:
return [self._get_cached_name(name, is_empty=True)] return [self._get_cached_name(name, is_empty=True)]
if self._is_instance and name not in dir_callback(): if self.is_instance and name not in dir_callback():
return [] return []
return [self._get_cached_name(name)] return [self._get_cached_name(name)]
@@ -368,7 +368,7 @@ class CompiledObjectFilter(AbstractFilter):
) )
# ``dir`` doesn't include the type names. # ``dir`` doesn't include the type names.
if not self._is_instance and needs_type_completions: if not self.is_instance and needs_type_completions:
for filter in builtin_from_name(self._evaluator, u'type').get_filters(): for filter in builtin_from_name(self._evaluator, u'type').get_filters():
names += filter.values() names += filter.values()
return names return names

9
jedi/evaluate/context/klass.py
View File

@@ -203,6 +203,15 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)):
origin_scope=origin_scope, origin_scope=origin_scope,
is_instance=is_instance is_instance=is_instance
) )
if not is_instance and self:
# Return completions of the meta class.
from jedi.evaluate.compiled import builtin_from_name
type_ = builtin_from_name(self.evaluator, u'type')
yield ClassFilter(
self.evaluator, self, node_context=type_,
origin_scope=origin_scope,
is_instance=is_instance
)
def is_class(self): def is_class(self):
return True return True

11
jedi/plugins/typeshed.py
View File

@@ -189,7 +189,7 @@ class NameWithStubMixin(object):
# This basically merges stub contexts with actual contexts. # This basically merges stub contexts with actual contexts.
for actual_context in actual_contexts: for actual_context in actual_contexts:
for stub_context in stub_contexts: for stub_context in stub_contexts:
if isinstance(actual_context, CompiledObject): if False and isinstance(actual_context, CompiledObject):
if isinstance(stub_context, ClassContext): if isinstance(stub_context, ClassContext):
yield CompiledStubClassContext(stub_context, actual_context) yield CompiledStubClassContext(stub_context, actual_context)
elif isinstance(stub_context, FunctionContext): elif isinstance(stub_context, FunctionContext):
@@ -433,6 +433,15 @@ class CompiledStubClassContext(_StubContextWithCompiled):
for f in filters: for f in filters:
yield f yield f
def get_class_filter(self, original_class, origin_scope, is_instance):
return StubParserTreeFilter(
[next(self.compiled_context.get_filters(search_global=False))],
self.evaluator,
context=self,
origin_scope=origin_scope,
search_global=False,
)
class CompiledStubFunctionContext(_StubContextWithCompiled): class CompiledStubFunctionContext(_StubContextWithCompiled):
pass pass