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

also remove crashes with pep 448 unpacking of lists and sets

Browse Source
This commit is contained in:
Claude
2018-09-22 23:29:13 +02:00
committed by Dave Halter
parent 6bc79b4933
commit a2b984ce24
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/evaluate/context/iterable.py
View File

@@ -346,7 +346,9 @@ class SequenceLiteralContext(Sequence):
return [] # Direct closing bracket, doesn't contain items. return [] # Direct closing bracket, doesn't contain items.
if array_node.type == 'testlist_comp': if array_node.type == 'testlist_comp':
return array_node.children[::2] # filter out (for now) pep 448 single-star unpacking
return [value for value in array_node.children[::2]
if value.type != "star_expr"]
elif array_node.type == 'dictorsetmaker': elif array_node.type == 'dictorsetmaker':
kv = [] kv = []
iterator = iter(array_node.children) iterator = iter(array_node.children)
@@ -359,12 +361,22 @@ class SequenceLiteralContext(Sequence):
else: else:
op = next(iterator, None) op = next(iterator, None)
if op is None or op == ',': if op is None or op == ',':
if key.type == "star_expr":
# pep 448 single-star unpacking
# for now ignoring values imported by *
pass
else:
kv.append(key) # A set. kv.append(key) # A set.
else: else:
assert op == ':' # A dict. assert op == ':' # A dict.
kv.append((key, next(iterator))) kv.append((key, next(iterator)))
next(iterator, None) # Possible comma. next(iterator, None) # Possible comma.
return kv return kv
else:
if array_node.type == "star_expr":
# pep 448 single-star unpacking
# for now ignoring values imported by *
return []
else: else:
return [array_node] return [array_node]

29
test/completion/types.py
View File

@@ -147,5 +147,30 @@ d = {'a': 3}
# Should resolve to int() but jedi is not smart enough yet # Should resolve to int() but jedi is not smart enough yet
# Here to make sure it doesn't result in crash though # Here to make sure it doesn't result in crash though
#? str() #?
{**d, "b": "b"}["a"] {**d}["a"]
s = {1, 2, 3}
#? set()
{*s}
#? set()
{*s, 4, *s}
s = {1, 2, 3}
# Should resolve to int() but jedi is not smart enough yet
# Here to make sure it doesn't result in crash though
#?
{*s}.pop()
#? int()
{*s, 4}.pop()
# Should resolve to int() but jedi is not smart enough yet
# Here to make sure it doesn't result in crash though
#?
[*s][0]
#? int()
[*s, 4][0]