VimPlug/jedi-vim
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi-vim.git synced 2025-12-11 13:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some refactoring errors in the vim plugin

Browse Source
This commit is contained in:
David Halter
2012-09-17 23:23:01 +02:00
parent 1ef7e8d02f
commit db77ff86d1
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi.vim
View File

@@ -211,12 +211,10 @@ endfunction
function! jedi#show_pydoc() function! jedi#show_pydoc()
python << PYTHONEOF python << PYTHONEOF
if 1: if 1:
row, column = vim.current.window.cursor script = get_script()
buf_path = vim.current.buffer.name
source = '\n'.join(vim.current.buffer)
try: try:
definitions = api.get_definition(source, row, column, buf_path) definitions = script.get_definition()
except api.NotFoundError: except jedi.NotFoundError:
definitions = [] definitions = []
except Exception: except Exception:
# print to stdout, will be in :messages # print to stdout, will be in :messages
@@ -443,7 +441,8 @@ import re
# normally you should import jedi. jedi-vim is an exception, because you can # normally you should import jedi. jedi-vim is an exception, because you can
# copy that directly into the .vim directory. # copy that directly into the .vim directory.
import api import jedi
import jedi.keywords
temp_rename = None # used for jedi#rename temp_rename = None # used for jedi#rename
@@ -465,7 +464,7 @@ def get_script(source=None, column=None):
if column is None: if column is None:
column = vim.current.window.cursor[1] column = vim.current.window.cursor[1]
buf_path = vim.current.buffer.name buf_path = vim.current.buffer.name
return api.Script(source, row, column, buf_path) return jedi.Script(source, row, column, buf_path)
def _goto(is_definition=False, is_related_name=False, no_output=False): def _goto(is_definition=False, is_related_name=False, no_output=False):
@@ -478,7 +477,7 @@ def _goto(is_definition=False, is_related_name=False, no_output=False):
definitions = script.get_definition() definitions = script.get_definition()
else: else:
definitions = script.goto() definitions = script.goto()
except api.NotFoundError: except jedi.NotFoundError:
echo_highlight("Cannot follow nothing. Put your cursor on a valid name.") echo_highlight("Cannot follow nothing. Put your cursor on a valid name.")
except Exception: except Exception:
# print to stdout, will be in :messages # print to stdout, will be in :messages
@@ -497,7 +496,7 @@ def _goto(is_definition=False, is_related_name=False, no_output=False):
d = list(definitions)[0] d = list(definitions)[0]
if d.in_builtin_module(): if d.in_builtin_module():
if isinstance(d.definition, api.keywords.Keyword): if isinstance(d.definition, jedi.keywords.Keyword):
echo_highlight("Cannot get the definition of Python keywords.") echo_highlight("Cannot get the definition of Python keywords.")
else: else:
echo_highlight("Builtin modules cannot be displayed.") echo_highlight("Builtin modules cannot be displayed.")