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

Script._goto improvements and documentation.

Browse Source
This commit is contained in:
Dave Halter
2014-09-03 17:27:26 +02:00
parent 95852f5e7f
commit e2ca11435c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/api/__init__.py
View File

@@ -430,6 +430,7 @@ class Script(object):
context = self._user_context.get_context() context = self._user_context.get_context()
user_stmt = self._parser.user_stmt() user_stmt = self._parser.user_stmt()
if next(context) in ('class', 'def'): if next(context) in ('class', 'def'):
# The cursor is on a class/function name.
user_scope = self._parser.user_scope() user_scope = self._parser.user_scope()
definitions = set([user_scope.name]) definitions = set([user_scope.name])
search_name = unicode(user_scope.name) search_name = unicode(user_scope.name)
@@ -468,15 +469,17 @@ class Script(object):
expression_list = stmt.expression_list() expression_list = stmt.expression_list()
if len(expression_list) == 0: if len(expression_list) == 0:
return [], '' return [], ''
# Only the first command is important, the rest should basically not # The reverse tokenizer only generates parses call.
# happen except in broken code (e.g. docstrings that aren't code). assert len(expression_list) == 1
call = expression_list[0] call = expression_list[0]
if isinstance(call, pr.Call): if isinstance(call, pr.Call):
call_path = list(call.generate_call_path()) call_path = list(call.generate_call_path())
else: else:
call_path = [call] # goto_assignments on Operator returns nothing.
return [], search_name
defs, search_name_part = self._evaluator.goto(stmt, call_path) defs, search_name_part = self._evaluator.goto(user_stmt or stmt,
call_path)
search_name = unicode(search_name_part) search_name = unicode(search_name_part)
definitions = follow_inexistent_imports(defs) definitions = follow_inexistent_imports(defs)
else: else:
@@ -697,7 +700,8 @@ def _names(source=None, path=None, encoding='utf-8'):
# Set line/column to a random position, because they don't matter. # Set line/column to a random position, because they don't matter.
script = Script(source, line=1, column=0, path=path, encoding=encoding) script = Script(source, line=1, column=0, path=path, encoding=encoding)
defs = [classes.Definition(script._evaluator, name_part) defs = [classes.Definition(script._evaluator, name_part)
for name_part in get_module_name_parts(script._parser.module())] for name_part in get_module_name_parts(script._parser.module())
if 390 < name_part.start_pos[0] < 399]
return sorted(defs, key=lambda x: (x.line, x.column)) return sorted(defs, key=lambda x: (x.line, x.column))