VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-17 04:24:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix and test CallSignature.bracket_start.

Browse Source
This commit is contained in:
Dave Halter
2015-03-04 12:15:43 +01:00
parent 1ce96f2581
commit a3c2108ecf
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jedi/api/__init__.py
View File

@@ -290,7 +290,7 @@ class Script(object):
return scopes
@memoize_default()
def _get_under_cursor_stmt(self, cursor_txt):
def _get_under_cursor_stmt(self, cursor_txt, start_pos=None):
tokenizer = source_tokens(cursor_txt)
r = Parser(self._grammar, cursor_txt, tokenizer=tokenizer)
try:
@@ -301,9 +301,10 @@ class Script(object):
user_stmt = self._parser.user_stmt()
if user_stmt is None:
# Set the start_pos to a pseudo position, that doesn't exist but works
# perfectly well (for both completions in docstrings and statements).
pos = self._pos
# Set the start_pos to a pseudo position, that doesn't exist but
# works perfectly well (for both completions in docstrings and
# statements).
pos = start_pos or self._pos
else:
pos = user_stmt.start_pos
@@ -500,11 +501,11 @@ class Script(object):
:rtype: list of :class:`classes.CallSignature`
"""
call_txt, call_index, key_name = self._user_context.call_signature()
call_txt, call_index, key_name, start_pos = self._user_context.call_signature()
if call_txt is None:
return []
stmt = self._get_under_cursor_stmt(call_txt)
stmt = self._get_under_cursor_stmt(call_txt, start_pos)
if stmt is None:
return []

9
jedi/api/classes.py
View File

@@ -613,11 +613,11 @@ class CallSignature(Definition):
It knows what functions you are currently in. e.g. `isinstance(` would
return the `isinstance` function. without `(` it would return nothing.
"""
def __init__(self, evaluator, executable_name, call, index, key_name):
def __init__(self, evaluator, executable_name, call_stmt, index, key_name):
super(CallSignature, self).__init__(evaluator, executable_name)
self._index = index
self._key_name = key_name
self._call = call
self._call_stmt = call_stmt
@property
def index(self):
@@ -649,10 +649,7 @@ class CallSignature(Definition):
The indent of the bracket that is responsible for the last function
call.
"""
c = self._call
while c.next is not None:
c = c.next
return c.name.end_pos
return self._call_stmt.end_pos
@property
def call_name(self):