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

interface changes from row/colum to position

Browse Source
This commit is contained in:
David Halter
2012-07-14 01:05:56 +02:00
parent 1e5377958b
commit cdf97b2bbe
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
functions.py
View File

@@ -138,7 +138,7 @@ def complete(source, row, column, source_path):
:rtype: list
"""
try:
scopes, path, dot, like = prepare_goto(source, row, column,
scopes, path, dot, like = prepare_goto(source, (row, column),
source_path, True)
except NotFoundError:
# normally this would be used like this: `NotFoundError as exc`, but
@@ -171,15 +171,16 @@ def complete(source, row, column, source_path):
return [Completion(c, needs_dot, len(like)) for c in set(completions)]
def prepare_goto(source, row, column, source_path, is_like_search):
f = modules.ModuleWithCursor(source_path, source=source, row=row)
def prepare_goto(source, position, source_path, is_like_search):
f = modules.ModuleWithCursor(source_path, source=source, position=position)
scope = f.parser.user_scope
print scope
if is_like_search:
path = f.get_path_until_cursor(column)
path = f.get_path_until_cursor()
path, dot, like = get_completion_parts(path)
else:
path = f.get_path_under_cursor(column)
path = f.get_path_under_cursor()
debug.dbg('start: %s in %s' % (path, scope))
@@ -194,8 +195,8 @@ def prepare_goto(source, row, column, source_path, is_like_search):
path_tuple = ()
raise NotFoundError(scope, path_tuple)
else:
stmt.line_nr = row
stmt.indent = column
stmt.line_nr = position[0]
stmt.indent = position[1]
stmt.parent = scope
scopes = evaluate.follow_statement(stmt)
@@ -223,7 +224,7 @@ def get_definitions(source, row, column, source_path):
:return: list of Definition objects, which are basically scopes.
:rtype: list
"""
scopes = prepare_goto(source, row, column, source_path, False)
scopes = prepare_goto(source, (row, column), source_path, False)
_clear_caches()
return [Definition(s) for s in set(scopes)]