From b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 27 Sep 2019 02:03:32 +0200
Subject: [PATCH] debug info: catch any errors with PythonJedi commands

Ref: https://github.com/davidhalter/jedi-vim/issues/953
---
 autoload/jedi.vim | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 4285102..2b0eddc 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -198,7 +198,11 @@ function! jedi#debug_info() abort
     echo 'Using Python version '.s:python_version.' to access Jedi.'
     let pyeval = s:python_version == 3 ? 'py3eval' : 'pyeval'
     let s:pythonjedi_called = 0
-    PythonJedi import vim; vim.command('let s:pythonjedi_called = 1')
+    try
+      PythonJedi import vim; vim.command('let s:pythonjedi_called = 1')
+    catch
+      echo 'Error when trying to import vim: '.v:exception
+    endtry
     if !s:pythonjedi_called
       echohl WarningMsg
       echom 'PythonJedi failed to run, likely a Python config issue.'
@@ -207,8 +211,14 @@ function! jedi#debug_info() abort
       endif
       echohl None
     else
-      PythonJedi from jedi_vim_debug import display_debug_info
-      PythonJedi display_debug_info()
+      try
+        PythonJedi from jedi_vim_debug import display_debug_info
+        PythonJedi display_debug_info()
+      catch
+        echohl WarningMsg
+        echo 'Error when running display_debug_info: '.v:exception
+        echohl None
+      endtry
     endif
     echo "\n"
     echo '##### Settings'