diff --git a/jedi/evaluate/dynamic.py b/jedi/evaluate/dynamic.py index ad65d6db..6ca429fe 100644 --- a/jedi/evaluate/dynamic.py +++ b/jedi/evaluate/dynamic.py @@ -89,7 +89,8 @@ def search_function_call(evaluator, func): parent = parent.parent 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:]: if t == '**': break diff --git a/jedi/evaluate/helpers.py b/jedi/evaluate/helpers.py index 49edadbf..86eec876 100644 --- a/jedi/evaluate/helpers.py +++ b/jedi/evaluate/helpers.py @@ -88,7 +88,8 @@ def call_of_name(name, cut_own_trailer=False): return name 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 name.start_pos > power.children[-1].start_pos): par = power diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py index 0c6c20ce..21d4211d 100644 --- a/jedi/evaluate/iterable.py +++ b/jedi/evaluate/iterable.py @@ -528,7 +528,7 @@ def unpack_tuple_to_dict(evaluator, types, exprlist): analysis.add(evaluator, 'value-error-too-few-values', has_parts, message="ValueError: need more than %s values to unpack" % n) return dct - elif exprlist.type == 'power': + elif exprlist.type == 'power' or exprlist.type == 'atom_expr': # Something like ``arr[x], var = ...``. # This is something that is not yet supported, would also be difficult # to write into a dict. diff --git a/jedi/parser/tree.py b/jedi/parser/tree.py index 7824a634..867d8cde 100644 --- a/jedi/parser/tree.py +++ b/jedi/parser/tree.py @@ -1342,7 +1342,7 @@ def _defined_names(current): names += _defined_names(child) elif is_node(current, 'atom'): 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 trailer = current.children[-1] if trailer.children[0] == '.':