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

Refactor the isinstance checks a bit

Browse Source
This commit is contained in:
Dave Halter
2020-01-12 02:00:27 +01:00
parent 700dd9380a
commit a17d4d9e16
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
jedi/inference/finder.py
View File

@@ -81,35 +81,39 @@ def check_flow_information(value, flow, search_name, pos):
return result return result
def _check_isinstance_type(value, element, search_name): def _get_isinstance_trailer_arglist(node):
try: if node.type in ('power', 'atom_expr') and len(node.children) == 2:
assert element.type in ('power', 'atom_expr') # This might be removed if we analyze and, etc
# this might be removed if we analyze and, etc first, trailer = node.children
assert len(element.children) == 2 if first.type == 'name' and first.value == 'isinstance' \
first, trailer = element.children and trailer.type == 'trailer' and trailer.children[0] == '(':
assert first.type == 'name' and first.value == 'isinstance' return trailer
assert trailer.type == 'trailer' and trailer.children[0] == '(' return None
assert len(trailer.children) == 3
# arglist stuff
def _check_isinstance_type(value, node, search_name):
lazy_cls = None
trailer = _get_isinstance_trailer_arglist(node)
if trailer is not None and len(trailer.children) == 3:
arglist = trailer.children[1] arglist = trailer.children[1]
args = TreeArguments(value.inference_state, value, arglist, trailer) args = TreeArguments(value.inference_state, value, arglist, trailer)
param_list = list(args.unpack()) param_list = list(args.unpack())
# Disallow keyword arguments # Disallow keyword arguments
assert len(param_list) == 2 if len(param_list) == 2:
(key1, lazy_value_object), (key2, lazy_value_cls) = param_list (key1, lazy_value_object), (key2, lazy_value_cls) = param_list
assert key1 is None and key2 is None if key1 is None and key2 is None:
call = helpers.call_of_leaf(search_name) call = helpers.call_of_leaf(search_name)
is_instance_call = helpers.call_of_leaf(lazy_value_object.data) is_instance_call = helpers.call_of_leaf(lazy_value_object.data)
# Do a simple get_code comparison. They should just have the same code, # Do a simple get_code comparison. They should just have the
# and everything will be all right. # same code, and everything will be all right.
normalize = value.inference_state.grammar._normalize normalize = value.inference_state.grammar._normalize
assert normalize(is_instance_call) == normalize(call) if normalize(is_instance_call) == normalize(call):
except AssertionError: lazy_cls = lazy_value_cls
if lazy_cls is None:
return None return None
value_set = NO_VALUES value_set = NO_VALUES
for cls_or_tup in lazy_value_cls.infer(): for cls_or_tup in lazy_cls.infer():
if isinstance(cls_or_tup, iterable.Sequence) and cls_or_tup.array_type == 'tuple': if isinstance(cls_or_tup, iterable.Sequence) and cls_or_tup.array_type == 'tuple':
for lazy_value in cls_or_tup.py__iter__(): for lazy_value in cls_or_tup.py__iter__():
value_set |= lazy_value.infer().execute_with_values() value_set |= lazy_value.infer().execute_with_values()