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

fix problems with error reporting

Browse Source
This commit is contained in:
David Halter
2013-08-28 20:24:49 +04:30
parent c3f9f03065
commit 02a7c89a37
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi_vim.py
View File

@@ -11,7 +11,7 @@ from shlex import split as shsplit
import vim import vim
import jedi import jedi
import jedi.keywords import jedi.keywords
from jedi._compatibility import unicode from jedi._compatibility import unicode, is_py3k
def catch_and_print_exceptions(func): def catch_and_print_exceptions(func):
@@ -40,7 +40,7 @@ def _catch_exception(string, is_eval):
Necessary, because the exact error message is not given by `vim.error`. Necessary, because the exact error message is not given by `vim.error`.
""" """
e = 'jedi#_vim_exceptions(%s, %s)' e = 'jedi#_vim_exceptions(%s, %s)'
result = vim.eval(e % (repr(PythonToVimStr(string)), is_eval)) result = vim.eval(e % (repr(PythonToVimStr(string, 'UTF-8')), is_eval))
if 'exception' in result: if 'exception' in result:
raise VimError(result['exception'], result['throwpoint'], string) raise VimError(result['exception'], result['throwpoint'], string)
return result['result'] return result['result']
@@ -65,6 +65,11 @@ if not hasattr(jedi, '__version__') or jedi.__version__ < (0, 7, 0):
class PythonToVimStr(unicode): class PythonToVimStr(unicode):
""" Vim has a different string implementation of single quotes """ """ Vim has a different string implementation of single quotes """
__slots__ = [] __slots__ = []
def __new__(cls, obj, encoding='UTF-8'):
if is_py3k or isinstance(obj, unicode):
return unicode.__new__(cls, obj)
else:
return unicode.__new__(cls, obj, encoding)
def __repr__(self): def __repr__(self):
# this is totally stupid and makes no sense but vim/python unicode # this is totally stupid and makes no sense but vim/python unicode