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

Create better class filters

Browse Source
This commit is contained in:
Dave Halter
2018-10-10 01:45:10 +02:00
parent 55f0966a9a
commit 5d44e1991f
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,13 @@ class ClassMixin(object):
def py__mro__(self): def py__mro__(self):
return py__mro__(self) return py__mro__(self)
def _create_class_filter(self, cls, origin_scope, is_instance):
return ClassFilter(
self.evaluator, self, node_context=cls,
origin_scope=origin_scope,
is_instance=is_instance
)
def get_filters(self, search_global=False, until_position=None, def get_filters(self, search_global=False, until_position=None,
origin_scope=None, is_instance=False): origin_scope=None, is_instance=False):
if search_global: if search_global:
@@ -216,11 +223,7 @@ class ClassMixin(object):
for filter in cls.get_filters(is_instance=is_instance): for filter in cls.get_filters(is_instance=is_instance):
yield filter yield filter
else: else:
yield ClassFilter( yield self._create_class_filter(cls, origin_scope, is_instance)
self.evaluator, self, node_context=cls,
origin_scope=origin_scope,
is_instance=is_instance
)
if not is_instance and self: if not is_instance and self:
# Return completions of the meta class. # Return completions of the meta class.
from jedi.evaluate.compiled import builtin_from_name from jedi.evaluate.compiled import builtin_from_name

23
jedi/evaluate/context/typing.py
View File

@@ -496,8 +496,29 @@ class AbstractAnnotatedClass(ClassMixin, ContextWrapper):
def get_type_var_filter(self): def get_type_var_filter(self):
return TypeVarFilter(self.get_given_types(), self.list_type_vars()) return TypeVarFilter(self.get_given_types(), self.list_type_vars())
def _create_class_filter(self, cls, origin_scope, is_instance):
filter_ = super(AbstractAnnotatedClass, self)._create_class_filter(
cls, origin_scope, is_instance
)
try:
stub_context = cls.stub_context
except AttributeError:
return filter_
else:
return stub_context.get_stub_only_filter(
# Take the first filter, which is here to filter module contents
# and wrap it.
[filter_],
search_global=False,
origin_scope=origin_scope,
)
def get_filters(self, search_global=False, *args, **kwargs): def get_filters(self, search_global=False, *args, **kwargs):
for f in super(AbstractAnnotatedClass, self).get_filters(search_global, *args, **kwargs): filters = super(AbstractAnnotatedClass, self).get_filters(
search_global,
*args, **kwargs
)
for f in filters:
yield f yield f
if search_global: if search_global: