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

rename working again with different goto function. now change the goto function itself

Browse Source
This commit is contained in:
David Halter
2012-09-21 22:36:47 +02:00
parent bfca702bf9
commit ef451f6dca
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
jedi/api.py
View File

@@ -227,8 +227,7 @@ class Script(object):
return c
def _prepare_goto(self, goto_path, is_like_search=False):
scope = self.parser.user_scope
debug.dbg('start: %s in %s' % (goto_path, scope))
debug.dbg('start: %s in %s' % (goto_path, self.parser.scope))
user_stmt = self.parser.user_stmt
if not user_stmt and len(goto_path.split('\n')) > 1:
@@ -250,18 +249,20 @@ class Script(object):
kill_count=kill_count, direct_resolve=True)]
else:
# just parse one statement, take it and evaluate it
r = parsing.PyFuzzyParser(goto_path, self.source_path,
no_docstr=True)
try:
stmt = r.module.statements[0]
except IndexError:
raise NotFoundError()
stmt.start_pos = self.pos
stmt.parent = weakref.ref(scope)
stmt = self._get_under_cursor_stmt(goto_path)
scopes = evaluate.follow_statement(stmt)
return scopes
def _get_under_cursor_stmt(self, cursor_txt):
r = parsing.PyFuzzyParser(cursor_txt, self.source_path, no_docstr=True)
try:
stmt = r.module.statements[0]
except IndexError:
raise NotFoundError()
stmt.start_pos = self.pos
stmt.parent = weakref.ref(self.parser.user_scope)
return stmt
def get_definition(self):
"""
Returns the definitions of a the path under the cursor. This is
@@ -346,13 +347,22 @@ class Script(object):
#(parsing.Param, parsing.Import)):
#definitions = [self.module.parser.user_stmt]
else:
evaluate.goto_names = []
scopes = self._prepare_goto(goto_path)
definitions = evaluate.goto2(scopes, search_name_new)
goto_path = self.module.get_path_under_cursor()
stmt = self._get_under_cursor_stmt(goto_path)
arr = stmt.get_assignment_calls()
call = arr.get_only_subelement()
definitions, search_name = evaluate.goto3(call)
#print 'd', definitions, call, call.parent_stmt().parent().start_pos
#evaluate.goto_names = []
#scopes = self._prepare_goto(goto_path)
#definitions = evaluate.goto2(scopes, search_name_new)
module = set([d.get_parent_until() for d in definitions])
module.add(self.module.parser.module)
names = dynamic.related_names(definitions, search_name, module)
if definitions:
names = dynamic.related_names(definitions, search_name, module)
else:
names = []
for d in definitions:
if isinstance(d, parsing.Statement):