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

Fix some small small issues around the latest commits

Browse Source
This commit is contained in:
Dave Halter
2018-11-18 23:53:56 +01:00
parent cf6cae728a
commit d2c0b13a02
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/signature.py
View File

@@ -16,7 +16,7 @@ class AbstractSignature(object):
def to_string(self): def to_string(self):
raise NotImplementedError raise NotImplementedError
def bind(self): def bind(self, context):
raise NotImplementedError raise NotImplementedError
def get_param_names(self): def get_param_names(self):
@@ -46,5 +46,5 @@ class BuiltinSignature(AbstractSignature):
def _function_context(self): def _function_context(self):
return self.context return self.context
def bind(self): def bind(self, context):
raise NotImplementedError('pls implement, need test case') raise NotImplementedError('pls implement, need test case, %s' % context)

11
jedi/plugins/typeshed.py
View File

@@ -297,10 +297,11 @@ class StubFilter(AbstractFilter):
""" """
Merging names from stubs and non-stubs. Merging names from stubs and non-stubs.
""" """
def __init__(self, parent_context, non_stub_filters, stub_filters): def __init__(self, parent_context, non_stub_filters, stub_filters, add_non_stubs):
self._parent_context = parent_context self._parent_context = parent_context
self._non_stub_filters = non_stub_filters self._non_stub_filters = non_stub_filters
self._stub_filters = stub_filters self._stub_filters = stub_filters
self._add_non_stubs = add_non_stubs
def get(self, name): def get(self, name):
non_stub_names = self._get_names_from_filters(self._non_stub_filters, name) non_stub_names = self._get_names_from_filters(self._non_stub_filters, name)
@@ -336,7 +337,9 @@ class StubFilter(AbstractFilter):
@to_list @to_list
def _merge_names(self, names, stub_names): def _merge_names(self, names, stub_names):
if not stub_names: if not stub_names:
if self._add_non_stubs:
return names return names
return []
if not names: if not names:
if isinstance(self._stub_filters[0].context, TypingModuleWrapper): if isinstance(self._stub_filters[0].context, TypingModuleWrapper):
return [TypingModuleName(n) for n in stub_names] return [TypingModuleName(n) for n in stub_names]
@@ -424,6 +427,8 @@ class StubFunctionContext(FunctionMixin, ContextWrapper):
class _StubOnlyContextMixin(object): class _StubOnlyContextMixin(object):
_add_non_stubs_in_filter = False
def _get_stub_only_filters(self, **filter_kwargs): def _get_stub_only_filters(self, **filter_kwargs):
return [StubOnlyFilter( return [StubOnlyFilter(
self.evaluator, self.evaluator,
@@ -438,6 +443,7 @@ class _StubOnlyContextMixin(object):
parent_context, parent_context,
non_stub_filters, non_stub_filters,
self._get_stub_only_filters(**filter_kwargs), self._get_stub_only_filters(**filter_kwargs),
add_non_stubs=self._add_non_stubs_in_filter,
) )
def _get_base_filters(self, filters, search_global=False, def _get_base_filters(self, filters, search_global=False,
@@ -449,7 +455,6 @@ class _StubOnlyContextMixin(object):
search_global=search_global, search_global=search_global,
until_position=until_position, until_position=until_position,
origin_scope=origin_scope, origin_scope=origin_scope,
# add_non_stubs=False # TODO add something like this
) )
for f in filters: for f in filters:
@@ -457,6 +462,8 @@ class _StubOnlyContextMixin(object):
class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext): class StubOnlyModuleContext(_StubOnlyContextMixin, ModuleContext):
_add_non_stubs_in_filter = True
def __init__(self, non_stub_context_set, *args, **kwargs): def __init__(self, non_stub_context_set, *args, **kwargs):
super(StubOnlyModuleContext, self).__init__(*args, **kwargs) super(StubOnlyModuleContext, self).__init__(*args, **kwargs)
self.non_stub_context_set = non_stub_context_set self.non_stub_context_set = non_stub_context_set