forked from VimPlug/jedi
python 3.5 uses atom_expr node in many places where previous python would use power node
This commit is contained in:
@@ -89,7 +89,8 @@ def search_function_call(evaluator, func):
|
|||||||
parent = parent.parent
|
parent = parent.parent
|
||||||
|
|
||||||
trailer = None
|
trailer = None
|
||||||
if tree.is_node(parent, 'power'):
|
if tree.is_node(parent, 'power') or \
|
||||||
|
tree.is_node(parent, 'atom_expr'):
|
||||||
for t in parent.children[1:]:
|
for t in parent.children[1:]:
|
||||||
if t == '**':
|
if t == '**':
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -88,7 +88,8 @@ def call_of_name(name, cut_own_trailer=False):
|
|||||||
return name
|
return name
|
||||||
|
|
||||||
power = par.parent
|
power = par.parent
|
||||||
if tree.is_node(power, 'power') and power.children[0] != name \
|
if (tree.is_node(power, 'power') or tree.is_node(power, 'atom_expr')) \
|
||||||
|
and power.children[0] != name \
|
||||||
and not (power.children[-2] == '**' and
|
and not (power.children[-2] == '**' and
|
||||||
name.start_pos > power.children[-1].start_pos):
|
name.start_pos > power.children[-1].start_pos):
|
||||||
par = power
|
par = power
|
||||||
|
|||||||
@@ -528,7 +528,7 @@ def unpack_tuple_to_dict(evaluator, types, exprlist):
|
|||||||
analysis.add(evaluator, 'value-error-too-few-values', has_parts,
|
analysis.add(evaluator, 'value-error-too-few-values', has_parts,
|
||||||
message="ValueError: need more than %s values to unpack" % n)
|
message="ValueError: need more than %s values to unpack" % n)
|
||||||
return dct
|
return dct
|
||||||
elif exprlist.type == 'power':
|
elif exprlist.type == 'power' or exprlist.type == 'atom_expr':
|
||||||
# Something like ``arr[x], var = ...``.
|
# Something like ``arr[x], var = ...``.
|
||||||
# This is something that is not yet supported, would also be difficult
|
# This is something that is not yet supported, would also be difficult
|
||||||
# to write into a dict.
|
# to write into a dict.
|
||||||
|
|||||||
+1
-1
@@ -1342,7 +1342,7 @@ def _defined_names(current):
|
|||||||
names += _defined_names(child)
|
names += _defined_names(child)
|
||||||
elif is_node(current, 'atom'):
|
elif is_node(current, 'atom'):
|
||||||
names += _defined_names(current.children[1])
|
names += _defined_names(current.children[1])
|
||||||
elif is_node(current, 'power'):
|
elif is_node(current, 'power') or is_node(current, 'atom_expr'):
|
||||||
if current.children[-2] != '**': # Just if there's no operation
|
if current.children[-2] != '**': # Just if there's no operation
|
||||||
trailer = current.children[-1]
|
trailer = current.children[-1]
|
||||||
if trailer.children[0] == '.':
|
if trailer.children[0] == '.':
|
||||||
|
|||||||
Reference in New Issue
Block a user