VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix the latest call signature tests.

Browse Source
This commit is contained in:
Dave Halter
2016-06-20 08:26:18 +02:00
parent 389885c285
commit fa13889e70
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/api/helpers.py
View File

@@ -196,20 +196,18 @@ CallSignatureDetails = namedtuple(
) )
def _get_index_and_key(node, position): def _get_index_and_key(nodes, position):
""" """
Returns the amount of commas and the keyword argument string. Returns the amount of commas and the keyword argument string.
""" """
nodes_before = [c for c in node.children if c.start_pos < position] nodes_before = [c for c in nodes if c.start_pos < position]
if nodes_before[-1].type == 'arglist': if nodes_before[-1].type == 'arglist':
node = nodes_before[-1] nodes_before = [c for c in nodes_before[-1].children if c.start_pos < position]
nodes_before = [c for c in node.children if c.start_pos < position]
key_str = None key_str = None
if nodes_before: if nodes_before:
last = nodes_before[-1] last = nodes_before[-1]
print('xxxxx', last)
if last.type == 'argument' and last.children[1].end_pos <= position: if last.type == 'argument' and last.children[1].end_pos <= position:
# Checked if the argument # Checked if the argument
key_str = last.children[0].value key_str = last.children[0].value
@@ -223,11 +221,14 @@ def _get_call_signature_details_from_error_node(node, position):
for index, element in reversed(list(enumerate(node.children))): for index, element in reversed(list(enumerate(node.children))):
# `index > 0` means that it's a trailer and not an atom. # `index > 0` means that it's a trailer and not an atom.
if element == '(' and element.end_pos <= position and index > 0: if element == '(' and element.end_pos <= position and index > 0:
# It's an error node, we don't want to match too much, just
# until the parentheses is enough.
children = node.children[index:]
name = element.get_previous_leaf() name = element.get_previous_leaf()
if name.type == 'name': if name.type == 'name':
return CallSignatureDetails( return CallSignatureDetails(
element, element,
*_get_index_and_key(node, position) *_get_index_and_key(children, position)
) )
@@ -254,7 +255,7 @@ def get_call_signature_details(module, position):
if node.type == 'trailer' and node.children[0] == '(': if node.type == 'trailer' and node.children[0] == '(':
leaf = node.get_previous_leaf() leaf = node.get_previous_leaf()
return CallSignatureDetails( return CallSignatureDetails(
node.children[0], *_get_index_and_key(node, position)) node.children[0], *_get_index_and_key(node.children, position))
node = node.parent node = node.parent