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

trying to clean up the goto mess

Browse Source
This commit is contained in:
Dave Halter
2014-03-28 13:46:31 +01:00
parent 54d9d325da
commit 29435852e6
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
jedi/api/__init__.py
View File

@@ -241,7 +241,7 @@ class Script(object):
return scopes
def _get_under_cursor_stmt(self, cursor_txt):
tokenizer = source_tokens(cursor_txt, self._pos[0] - 1)
tokenizer = source_tokens(cursor_txt, line_offset=self._pos[0] - 1)
r = Parser(cursor_txt, no_docstr=True, tokenizer=tokenizer)
try:
# Take the last statement available.
@@ -249,12 +249,12 @@ class Script(object):
except IndexError:
raise NotFoundError()
user_stmt = self._parser.user_stmt()
if user_stmt is None or isinstance(user_stmt, pr.Param):
if type(user_stmt) is pr.Statement:
stmt.start_pos = user_stmt.start_pos
else:
# Set the start_pos to a pseudo position, that doesn't exist but works
# perfectly well (for both completions in docstrings and statements).
stmt.start_pos = self._pos
else:
stmt.start_pos = user_stmt.start_pos[0], user_stmt.start_pos[1] - 1
stmt.parent = self._parser.user_scope()
return stmt
@@ -427,8 +427,36 @@ class Script(object):
definitions.append(import_name[0])
else:
stmt = self._get_under_cursor_stmt(goto_path)
defs, search_name = self._evaluator.goto(stmt)
definitions = follow_inexistent_imports(defs)
def test_lhs():
"""
Special rule for goto, left hand side of the statement returns
itself, if the name is ``foo``, but not ``foo.bar``.
"""
if isinstance(user_stmt, pr.Statement):
for name in user_stmt.get_set_vars():
if name.start_pos <= self._pos <= name.end_pos \
and len(name.names) == 1:
return user_stmt, name.names[-1]
return None, None
lhs, search_name = test_lhs()
if lhs is None:
expression_list = stmt.expression_list()
if len(expression_list) == 0:
return [], ''
# Only the first command is important, the rest should basically not
# happen except in broken code (e.g. docstrings that aren't code).
call = expression_list[0]
if isinstance(call, pr.Call):
call_path = list(call.generate_call_path())
else:
call_path = [call]
defs, search_name = self._evaluator.goto(stmt, call_path)
definitions = follow_inexistent_imports(defs)
else:
definitions = [lhs]
if isinstance(user_stmt, pr.Statement):
c = user_stmt.expression_list()
if c and not isinstance(c[0], (str, unicode)) \

18
jedi/evaluate/__init__.py
View File

@@ -328,24 +328,9 @@ class Evaluator(object):
debug.dbg('execute result: %s in %s', stmts, obj)
return imports.strip_imports(self, stmts)
def goto(self, stmt, call_path=None):
if call_path is None:
expression_list = stmt.expression_list()
if len(expression_list) == 0:
return [], ''
# Only the first command is important, the rest should basically not
# happen except in broken code (e.g. docstrings that aren't code).
call = expression_list[0]
if isinstance(call, pr.Call):
call_path = list(call.generate_call_path())
else:
call_path = [call]
def goto(self, stmt, call_path):
scope = stmt.get_parent_until(pr.IsScope)
pos = stmt.start_pos
# Need this to return the params if you're actually doing a goto on the
# param.
pos = pos[0], pos[1] + 1
call_path, search = call_path[:-1], call_path[-1]
if call_path:
@@ -353,6 +338,7 @@ class Evaluator(object):
search_global = False
pos = None
else:
# TODO does this exist? i don't think so
scopes = [scope]
search_global = True
follow_res = []