VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 22:14:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified _prepare_goto

Browse Source
This commit is contained in:
Dave Halter
2014-01-29 00:03:03 +01:00
parent 13696018a2
commit 7aef1f934d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/__init__.py
View File

@@ -210,10 +210,7 @@ class Script(object):
""" """
debug.dbg('start: %s in %s', goto_path, self._parser.user_scope()) debug.dbg('start: %s in %s', goto_path, self._parser.user_scope())
if is_completion: user_stmt = self._parser.user_stmt_with_whitespace()
user_stmt = self._parser.user_stmt_with_whitespace()
else:
user_stmt = self._parser.user_stmt()
if not user_stmt and len(goto_path.split('\n')) > 1: if not user_stmt and len(goto_path.split('\n')) > 1:
# If the user_stmt is not defined and the goto_path is multi line, # If the user_stmt is not defined and the goto_path is multi line,
# something's strange. Most probably the backwards tokenizer # something's strange. Most probably the backwards tokenizer
@@ -320,6 +317,7 @@ class Script(object):
scopes.update(resolve_import_paths(set(s.follow()))) scopes.update(resolve_import_paths(set(s.follow())))
return scopes return scopes
user_stmt = self._parser.user_stmt_with_whitespace()
goto_path = self._user_context.get_path_under_cursor() goto_path = self._user_context.get_path_under_cursor()
context = self._user_context.get_context() context = self._user_context.get_context()
definitions = set() definitions = set()
@@ -328,7 +326,6 @@ class Script(object):
else: else:
# Fetch definition of callee, if there's no path otherwise. # Fetch definition of callee, if there's no path otherwise.
if not goto_path: if not goto_path:
user_stmt = self._parser.user_stmt_with_whitespace()
(call, _) = helpers.func_call_and_param_index(user_stmt, self._pos) (call, _) = helpers.func_call_and_param_index(user_stmt, self._pos)
if call is not None: if call is not None:
while call.next is not None: while call.next is not None: