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

Fix the jedi-vim debug tool, fixes #795

Browse Source
This commit is contained in:
Dave Halter
2018-04-11 09:01:37 +02:00
parent e54a17ec71
commit fa1aaa10cf
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pythonx/jedi_vim.py
View File

@@ -160,7 +160,7 @@ def _check_jedi_availability(show_error=False):
last_force_python_error = None last_force_python_error = None
def _get_environment(): def get_environment():
global last_force_python_error global last_force_python_error
force_python_version = vim_eval("g:jedi#force_py_version") force_python_version = vim_eval("g:jedi#force_py_version")
@@ -204,7 +204,7 @@ def get_script(source=None, column=None):
return jedi.Script( return jedi.Script(
source, row, column, buf_path, source, row, column, buf_path,
encoding=vim_eval('&encoding') or 'latin1', encoding=vim_eval('&encoding') or 'latin1',
environment=_get_environment(), environment=get_environment(),
) )
@@ -670,7 +670,7 @@ def py_import():
args = shsplit(vim.eval('a:args')) args = shsplit(vim.eval('a:args'))
import_path = args.pop() import_path = args.pop()
text = 'import %s' % import_path text = 'import %s' % import_path
scr = jedi.Script(text, 1, len(text), '', environment=_get_environment()) scr = jedi.Script(text, 1, len(text), '', environment=get_environment())
try: try:
completion = scr.goto_assignments()[0] completion = scr.goto_assignments()[0]
except IndexError: except IndexError:
@@ -693,7 +693,7 @@ def py_import_completions():
comps = [] comps = []
else: else:
text = 'import %s' % argl text = 'import %s' % argl
script = jedi.Script(text, 1, len(text), '', environment=_get_environment()) script = jedi.Script(text, 1, len(text), '', environment=get_environment())
comps = ['%s%s' % (argl, c.complete) for c in script.completions()] comps = ['%s%s' % (argl, c.complete) for c in script.completions()]
vim.command("return '%s'" % '\n'.join(comps)) vim.command("return '%s'" % '\n'.join(comps))

9
pythonx/jedi_vim_debug.py
View File

@@ -34,9 +34,12 @@ def display_debug_info():
script_evaluator = jedi_vim.jedi.Script('')._evaluator script_evaluator = jedi_vim.jedi.Script('')._evaluator
try: try:
sys_path = script_evaluator.project.sys_path sys_path = jedi_vim.get_environment().get_sys_path()
except AttributeError: except:
sys_path = script_evaluator.sys_path try:
sys_path = script_evaluator.project.sys_path
except AttributeError:
sys_path = script_evaluator.sys_path
for p in sys_path: for p in sys_path:
echo("printf(' - `%s`', {0!r})".format(p)) echo("printf(' - `%s`', {0!r})".format(p))
except Exception as e: except Exception as e: