From faf0cefb824194ea789c8bd1d2631a092c5cbf05 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Fri, 1 Jun 2018 19:55:05 +0100
Subject: [PATCH] Use the formatted message, unformatted, if there is no other
 message

---
 python3/vimspector/debug_adapter_connection.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/python3/vimspector/debug_adapter_connection.py b/python3/vimspector/debug_adapter_connection.py
index 40d5aca..8dbb568 100644
--- a/python3/vimspector/debug_adapter_connection.py
+++ b/python3/vimspector/debug_adapter_connection.py
@@ -138,14 +138,18 @@ class DebugAdapterConnection( object ):
         if handler:
           handler( message )
       else:
-        reason = (
-          message.get( 'body', {} ).get( 'error', {} ).get( 'format' ) or
-          message.get( 'message' ) or
-          'no reason' )
+        reason = message.get( 'message' )
+        if not message:
+          fmt = message.get( 'body', {} ).get( 'error', {} ).get( 'format' )
+          if fmt:
+            # TODO: Actually make this work
+            reason = fmt
+          else:
+            message = 'No reason'
 
         self._logger.error( 'Request failed: {0}'.format( reason ) )
-        utils.UserMessage( 'Request failed: {0}'.format( reason ),
-                           persist = True )
+        utils.UserMessage( 'Request failed: {0}'.format( reason ) )
+                           
 
     elif message[ 'type' ] == 'event':
       method = 'OnEvent_' + message[ 'event' ]