From 57da7ff59b97c300f27107ba8fee4ae9df6e168c Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Tue, 7 Jul 2020 15:38:26 +0100
Subject: [PATCH 01/13] Add rebuild script for fidessa

---
 rebuild | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 rebuild

diff --git a/rebuild b/rebuild
new file mode 100755
index 0000000..76b891d
--- /dev/null
+++ b/rebuild
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+./install_gadget.py --all --force-all --basedir ../vimspector-fidessa
+                        

From 7b37d4cbf5de7c4b89589e86b7db2486fa63106c Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Fri, 26 Feb 2021 19:21:40 +0000
Subject: [PATCH 02/13] Add a way to have adapter specific message handlers

---
 python3/vimspector/custom/java.py             | 34 +++++++++++++++++++
 .../vimspector/debug_adapter_connection.py    | 32 ++++++++---------
 python3/vimspector/debug_session.py           | 16 ++++++++-
 python3/vimspector/gadgets.py                 |  3 +-
 support/test/java/test_project/pom.xml        |  4 +--
 5 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 python3/vimspector/custom/java.py

diff --git a/python3/vimspector/custom/java.py b/python3/vimspector/custom/java.py
new file mode 100644
index 0000000..ebfec35
--- /dev/null
+++ b/python3/vimspector/custom/java.py
@@ -0,0 +1,34 @@
+# vimspector - A multi-language debugging system for Vim
+# Copyright 2021 Ben Jackson
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from vimspector.debug_session import DebugSession
+from vimspector import utils
+
+
+class JavaDebugAdapter( object ):
+  def __init__( self, debug_session: DebugSession ):
+    self.debug_session = debug_session
+
+  def OnEvent_hotcodereplace( self, message ):
+    # Hack for java debug server hot-code-replace
+    if utils.Call( 'confirm',
+                   'Code has changed, hot reload?',
+                   '&Yes,&No',
+                   1,
+                   'Question' ) == 1:
+      self.debug_session._connection.DoRequest( None, {
+        'command': 'redefineClasses',
+        'arguments': {},
+      } )
diff --git a/python3/vimspector/debug_adapter_connection.py b/python3/vimspector/debug_adapter_connection.py
index 283c40c..df2ef13 100644
--- a/python3/vimspector/debug_adapter_connection.py
+++ b/python3/vimspector/debug_adapter_connection.py
@@ -29,14 +29,14 @@ class PendingRequest( object ):
 
 
 class DebugAdapterConnection( object ):
-  def __init__( self, handler, send_func ):
+  def __init__( self, handlers, send_func ):
     self._logger = logging.getLogger( __name__ )
     utils.SetUpLogging( self._logger )
 
     self._Write = send_func
     self._SetState( 'READ_HEADER' )
     self._buffer = bytes()
-    self._handler = handler
+    self._handlers = handlers
     self._next_message_id = 0
     self._outstanding_requests = {}
 
@@ -124,7 +124,7 @@ class DebugAdapterConnection( object ):
 
   def Reset( self ):
     self._Write = None
-    self._handler = None
+    self._handlers = None
 
     while self._outstanding_requests:
       _, request = self._outstanding_requests.popitem()
@@ -237,7 +237,7 @@ class DebugAdapterConnection( object ):
 
 
   def _OnMessageReceived( self, message ):
-    if not self._handler:
+    if not self._handlers:
       return
 
     if message[ 'type' ] == 'response':
@@ -270,25 +270,21 @@ class DebugAdapterConnection( object ):
         self._logger.error( 'Request failed: {0}'.format( reason ) )
         if request.failure_handler:
           request.failure_handler( reason, message )
-        elif 'OnFailure' in dir( self._handler ):
-          self._handler.OnFailure( reason, request.msg, message )
         else:
-          utils.UserMessage( 'Request failed: {0}'.format( reason ) )
+          for h in self._handlers:
+            if 'OnFailure' in dir( h ):
+              h.OnFailure( reason, request.msg, message )
+
     elif message[ 'type' ] == 'event':
       method = 'OnEvent_' + message[ 'event' ]
-      if method in dir( self._handler ):
-        getattr( self._handler, method )( message )
-      else:
-        utils.UserMessage( 'Unhandled event: {0}'.format( message[ 'event' ] ),
-                           persist = True )
+      for h in self._handlers:
+        if method in dir( h ):
+          getattr( h, method )( message )
     elif message[ 'type' ] == 'request':
       method = 'OnRequest_' + message[ 'command' ]
-      if method in dir( self._handler ):
-        getattr( self._handler, method )( message )
-      else:
-        utils.UserMessage(
-          'Unhandled request: {0}'.format( message[ 'command' ] ),
-          persist = True )
+      for h in self._handlers:
+        if method in dir( h ):
+          getattr( h, method )( message )
 
 
 def _KillTimer( request ):
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 6fb0b16..ae7de72 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -21,6 +21,7 @@ import shlex
 import subprocess
 import functools
 import vim
+import importlib
 
 from vimspector import ( breakpoints,
                          code,
@@ -781,8 +782,21 @@ class DebugSession( object ):
                                                  self._splash_screen,
                                                  "Unable to start adapter" )
     else:
+      if 'custom_handler' in self._adapter:
+        spec = self._adapter[ 'custom_handler' ]
+        if isinstance( spec, dict ):
+          module = spec[ 'module' ]
+          cls = spec[ 'class' ]
+        else:
+          module, cls = spec.rsplit( '.', 1 )
+
+        CustomHandler = getattr( importlib.import_module( module ), cls )
+        handlers = [ CustomHandler( self ), self ]
+      else:
+        handlers = [ self ]
+
       self._connection = debug_adapter_connection.DebugAdapterConnection(
-        self,
+        handlers,
         lambda msg: utils.Call(
           "vimspector#internal#{}#Send".format( self._connection_type ),
           msg ) )
diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py
index d1b6872..5c61074 100644
--- a/python3/vimspector/gadgets.py
+++ b/python3/vimspector/gadgets.py
@@ -159,7 +159,8 @@ GADGETS = {
         "port": "${DAPPort}",
         "configuration": {
           "cwd": "${workspaceRoot}"
-        }
+        },
+        'custom_handler': 'vimspector.custom.java.JavaDebugAdapter'
       }
     },
   },
diff --git a/support/test/java/test_project/pom.xml b/support/test/java/test_project/pom.xml
index 890e7e8..e6dc4d3 100644
--- a/support/test/java/test_project/pom.xml
+++ b/support/test/java/test_project/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>TestApplication</artifactId>
   <version>1</version>
   <properties>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 </project>

From 48076ba2efae9a45249ade31e47ebdba47108480 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Tue, 2 Mar 2021 10:48:55 +0000
Subject: [PATCH 03/13] Print hotcodereplace messages

---
 python3/vimspector/custom/java.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/python3/vimspector/custom/java.py b/python3/vimspector/custom/java.py
index ebfec35..0dfa89c 100644
--- a/python3/vimspector/custom/java.py
+++ b/python3/vimspector/custom/java.py
@@ -23,12 +23,18 @@ class JavaDebugAdapter( object ):
 
   def OnEvent_hotcodereplace( self, message ):
     # Hack for java debug server hot-code-replace
-    if utils.Call( 'confirm',
-                   'Code has changed, hot reload?',
-                   '&Yes,&No',
-                   1,
-                   'Question' ) == 1:
-      self.debug_session._connection.DoRequest( None, {
-        'command': 'redefineClasses',
-        'arguments': {},
-      } )
+    body = message.get( 'body' ) or {}
+
+    if body.get( 'type' ) != 'hotcodereplace':
+      return
+
+    if body.get( 'changeType' ) == 'BUILD_COMPLETE':
+      if utils.AskForInput( 'Code has changed, hot reload? [Y/N] ',
+                            'Y' ).upper()[ 0 ] == 'Y':
+        self.debug_session._connection.DoRequest( None, {
+          'command': 'redefineClasses',
+          'arguments': {},
+        } )
+    elif body.get( 'message' ):
+      utils.UserMessage( 'Hot code replace: ' + body[ 'message' ] )
+

From 68edda842a3d43fd34f278e3722f0df7c7df99c8 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Thu, 4 Mar 2021 21:44:54 +0000
Subject: [PATCH 04/13] Use popup for confirmations (note these have to be
 async)

---
 autoload/vimspector/internal/neopopup.vim | 22 ++++++++
 autoload/vimspector/internal/popup.vim    | 31 +++++++++++
 python3/vimspector/custom/java.py         | 17 +++---
 python3/vimspector/debug_session.py       | 63 ++++++++++++++---------
 python3/vimspector/utils.py               | 29 ++++++++++-
 5 files changed, 129 insertions(+), 33 deletions(-)

diff --git a/autoload/vimspector/internal/neopopup.vim b/autoload/vimspector/internal/neopopup.vim
index fe5fe05..cc25020 100644
--- a/autoload/vimspector/internal/neopopup.vim
+++ b/autoload/vimspector/internal/neopopup.vim
@@ -80,6 +80,28 @@ function! vimspector#internal#neopopup#HideSplash( id ) abort
   unlet s:db[ a:id ]
 endfunction
 
+function! vimspector#internal#neopopup#Confirm( confirm_id,
+                                              \ text,
+                                              \ default_value ) abort
+  let result = confirm( a:text, '&Yes &No &Default', 3 )
+
+  " Map the results to what popup_menu_filter would return (ok s:ConfirmCallback
+  " in popup.vim)
+  if result == 2
+    " No is represented as 0
+    let result = 0
+  elseif result == 0
+    " User pressed ESC/ctrl-c
+    let result = -1
+  elseif result == 3
+    " Default
+    let result = a:default_value
+  endif
+
+  py3 __import__( 'vimspector', fromlist = [ 'utils' ] ).utils.ConfirmCallback(
+        \ int( vim.eval( 'a:confirm_id' ) ),
+        \ int( vim.eval( 'result' ) ) )
+endfunction
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo
diff --git a/autoload/vimspector/internal/popup.vim b/autoload/vimspector/internal/popup.vim
index fc8820b..e8658ab 100644
--- a/autoload/vimspector/internal/popup.vim
+++ b/autoload/vimspector/internal/popup.vim
@@ -32,6 +32,37 @@ function! vimspector#internal#popup#HideSplash( id ) abort
   call popup_hide( a:id )
 endfunction
 
+function! s:YesNoDefaultFilter( default_value, id, key ) abort
+  if a:key ==# "\<CR>" || a:key ==# 'D' || a:key ==# 'd'
+    call popup_close( a:id, a:default_value )
+  endif
+
+  return popup_filter_yesno( a:id, a:key )
+endfunction
+
+function! s:ConfirmCallback( confirm_id, id, result ) abort
+  py3 __import__( 'vimspector', fromlist = [ 'utils' ] ).utils.ConfirmCallback(
+        \ int( vim.eval( 'a:confirm_id' ) ),
+        \ int( vim.eval( 'a:result' ) ) )
+endfunction
+
+function! vimspector#internal#popup#Confirm(
+      \ confirm_id,
+      \ text,
+      \ default_value ) abort
+  let text = a:text
+  if type( a:text ) != v:t_list
+    let text = [ a:text ]
+  endif
+
+  call extend( text, [ '', '(Y)es (N)o (D)efault' ] )
+
+  return popup_dialog( text, {
+        \   'callback': function( 's:ConfirmCallback', [ a:confirm_id ] ),
+        \   'filter': function( 's:YesNoDefaultFilter', [ a:default_value ] )
+        \ } )
+endfunction
+
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo
diff --git a/python3/vimspector/custom/java.py b/python3/vimspector/custom/java.py
index 0dfa89c..83705c1 100644
--- a/python3/vimspector/custom/java.py
+++ b/python3/vimspector/custom/java.py
@@ -29,12 +29,15 @@ class JavaDebugAdapter( object ):
       return
 
     if body.get( 'changeType' ) == 'BUILD_COMPLETE':
-      if utils.AskForInput( 'Code has changed, hot reload? [Y/N] ',
-                            'Y' ).upper()[ 0 ] == 'Y':
-        self.debug_session._connection.DoRequest( None, {
-          'command': 'redefineClasses',
-          'arguments': {},
-        } )
+      def handler( result ):
+        if result == 1:
+          self.debug_session._connection.DoRequest( None, {
+            'command': 'redefineClasses',
+            'arguments': {},
+          } )
+
+      utils.Confirm( self.debug_session._api_prefix,
+                     'Code has changed, hot reload?',
+                     handler )
     elif body.get( 'message' ):
       utils.UserMessage( 'Hot code replace: ' + body[ 'message' ] )
-
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index ae7de72..9f6e863 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -804,39 +804,52 @@ class DebugSession( object ):
     self._logger.info( 'Debug Adapter Started' )
 
   def _StopDebugAdapter( self, interactive = False, callback = None ):
-    self._splash_screen = utils.DisplaySplash(
-      self._api_prefix,
-      self._splash_screen,
-      "Shutting down debug adapter..." )
+    def disconnect( arguments = {} ):
+      self._splash_screen = utils.DisplaySplash(
+        self._api_prefix,
+        self._splash_screen,
+        "Shutting down debug adapter..." )
 
-    def handler( *args ):
-      self._splash_screen = utils.HideSplash( self._api_prefix,
-                                              self._splash_screen )
+      def handler( *args ):
+        self._splash_screen = utils.HideSplash( self._api_prefix,
+                                                self._splash_screen )
 
-      if callback:
-        self._logger.debug( "Setting server exit handler before disconnect" )
-        assert not self._run_on_server_exit
-        self._run_on_server_exit = callback
+        if callback:
+          self._logger.debug( "Setting server exit handler before disconnect" )
+          assert not self._run_on_server_exit
+          self._run_on_server_exit = callback
 
-      vim.eval( 'vimspector#internal#{}#StopDebugSession()'.format(
-        self._connection_type ) )
+        vim.eval( 'vimspector#internal#{}#StopDebugSession()'.format(
+          self._connection_type ) )
 
-    arguments = {}
-    if ( interactive and
-         self._server_capabilities.get( 'supportTerminateDebuggee' ) ):
-      if self._stackTraceView.AnyThreadsRunning():
-        choice = utils.AskForInput( "Terminate debuggee [Y/N/default]? ", "" )
-        if choice == "Y" or choice == "y":
+      self._connection.DoRequest( handler, {
+        'command': 'disconnect',
+        'arguments': {},
+      }, failure_handler = handler, timeout = 5000 )
+
+    if not interactive:
+      disconnect()
+    elif not self._server_capabilities.get( 'supportTerminateDebuggee' ):
+      disconnect()
+    elif not self._stackTraceView.AnyThreadsRunning():
+      disconnect()
+    else:
+      def handle_choice( choice ):
+        arguments = {}
+        if choice == 1:
           arguments[ 'terminateDebuggee' ] = True
-        elif choice == "N" or choice == 'n':
+        elif choice == 0:
           arguments[ 'terminateDebuggee' ] = False
+        elif choice == -1:
+          # Abort
+          return
 
-    self._connection.DoRequest( handler, {
-      'command': 'disconnect',
-      'arguments': arguments,
-    }, failure_handler = handler, timeout = 5000 )
+        disconnect( arguments )
 
-    # TODO: Use the 'tarminate' request if supportsTerminateRequest set
+      utils.Confirm( self._api_prefix,
+                     "Terminate debuggee?",
+                     handle_choice,
+                     default_value = 3 )
 
 
   def _PrepareAttach( self, adapter_config, launch_config ):
diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index e7cb537..5aefc37 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -375,6 +375,31 @@ def AskForInput( prompt, default_value = None, completion = None ):
       return None
 
 
+CONFIRM = {}
+CONFIRM_ID = 0
+
+def ConfirmCallback( confirm_id, result ):
+  try:
+    handler = CONFIRM.pop( confirm_id )
+  except KeyError:
+    UserMessage( f"Internal error: unexpected callback id { confirm_id }",
+                 persist = True,
+                 error = True )
+    return
+
+  handler( result )
+
+
+def Confirm( api_prefix, prompt, handler, default_value = 1 ):
+  global CONFIRM_ID
+  CONFIRM_ID += 1
+  CONFIRM[ CONFIRM_ID ] = handler
+  Call( f'vimspector#internal#{ api_prefix }popup#Confirm',
+        CONFIRM_ID,
+        prompt,
+        default_value )
+
+
 def AppendToBuffer( buf, line_or_lines, modified=False ):
   line = 1
   try:
@@ -403,8 +428,10 @@ def AppendToBuffer( buf, line_or_lines, modified=False ):
 
 
 
-def ClearBuffer( buf ):
+def ClearBuffer( buf, modified = False ):
   buf[ : ] = None
+  if not modified:
+    buf.options[ 'modified' ] = False
 
 
 def SetBufferContents( buf, lines, modified=False ):

From 810946a1c1a6458e1622d0515a76b10ba5c93ff1 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Fri, 5 Mar 2021 21:09:39 +0000
Subject: [PATCH 05/13] Allow forcing selection from the menu with <leader>F5

---
 autoload/vimspector.vim             | 4 ++--
 plugin/vimspector.vim               | 3 +++
 python3/vimspector/debug_session.py | 7 ++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/autoload/vimspector.vim b/autoload/vimspector.vim
index e94a177..c4a1756 100644
--- a/autoload/vimspector.vim
+++ b/autoload/vimspector.vim
@@ -41,11 +41,11 @@ function! s:Enabled() abort
   return s:enabled
 endfunction
 
-function! vimspector#Launch() abort
+function! vimspector#Launch( ... ) abort
   if !s:Enabled()
     return
   endif
-  py3 _vimspector_session.Start()
+  py3 _vimspector_session.Start( *vim.eval( 'a:000' ) )
 endfunction
 
 function! vimspector#LaunchWithSettings( settings ) abort
diff --git a/plugin/vimspector.vim b/plugin/vimspector.vim
index 53855ef..24f8914 100644
--- a/plugin/vimspector.vim
+++ b/plugin/vimspector.vim
@@ -35,6 +35,8 @@ let s:mappings = get( g:, 'vimspector_enable_mappings', '' )
 
 nnoremap <silent> <Plug>VimspectorContinue
       \ :<c-u>call vimspector#Continue()<CR>
+nnoremap <silent> <Plug>VimspectorLaunch
+      \ :<c-u>call vimspector#Launch( v:true )<CR>
 nnoremap <silent> <Plug>VimspectorStop
       \ :<c-u>call vimspector#Stop()<CR>
 nnoremap <silent> <Plug>VimspectorRestart
@@ -79,6 +81,7 @@ if s:mappings ==# 'VISUAL_STUDIO'
   nmap <S-F11>      <Plug>VimspectorStepOut
 elseif s:mappings ==# 'HUMAN'
   nmap <F5>         <Plug>VimspectorContinue
+  nmap <leader><F5> <Plug>VimspectorLaunch
   nmap <F3>         <Plug>VimspectorStop
   nmap <F4>         <Plug>VimspectorRestart
   nmap <F6>         <Plug>VimspectorPause
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 9f6e863..03874f3 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -100,7 +100,7 @@ class DebugSession( object ):
 
     return launch_config_file, configurations
 
-  def Start( self, launch_variables = None ):
+  def Start( self, force_choose=False, launch_variables = None ):
     # We mutate launch_variables, so don't mutate the default argument.
     # https://docs.python-guide.org/writing/gotchas/#mutable-default-arguments
     if launch_variables is None:
@@ -135,6 +135,11 @@ class DebugSession( object ):
 
     if 'configuration' in launch_variables:
       configuration_name = launch_variables.pop( 'configuration' )
+    elif force_choose:
+      # Always display the menu
+      configuration_name = utils.SelectFromList(
+        'Which launch configuration?',
+        sorted( configurations.keys() ) )
     elif ( len( configurations ) == 1 and
            next( iter( configurations.values() ) ).get( "autoselect", True ) ):
       configuration_name = next( iter( configurations.keys() ) )

From 4fbafaa46264a50b9a50f05283ea9ef57203c064 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Sat, 6 Mar 2021 20:24:24 +0000
Subject: [PATCH 06/13] Create a messagebox-like interface in vim

---
 autoload/vimspector/internal/balloon.vim  |  6 +-
 autoload/vimspector/internal/neopopup.vim |  3 +
 autoload/vimspector/internal/popup.vim    | 88 ++++++++++++++++++++---
 python3/vimspector/utils.py               |  6 +-
 4 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/autoload/vimspector/internal/balloon.vim b/autoload/vimspector/internal/balloon.vim
index 32d17ab..23954e6 100644
--- a/autoload/vimspector/internal/balloon.vim
+++ b/autoload/vimspector/internal/balloon.vim
@@ -72,11 +72,7 @@ function! vimspector#internal#balloon#CreateTooltip( is_hover, ... ) abort
       \ 'mapping': 0
       \ }
 
-    " When ambiwidth is single, use prettier characters for the border. This
-    " would look silly when ambiwidth is double.
-    if &ambiwidth ==# 'single' && &encoding ==? 'utf-8'
-      let config[ 'borderchars' ] = [ '─', '│', '─', '│', '╭', '╮', '┛', '╰' ]
-    endif
+    let config = vimspector#internal#popup#SetBorderChars( config )
 
     if a:is_hover
       let config[ 'filter' ] = 'vimspector#internal#balloon#MouseFilter'
diff --git a/autoload/vimspector/internal/neopopup.vim b/autoload/vimspector/internal/neopopup.vim
index cc25020..189c78c 100644
--- a/autoload/vimspector/internal/neopopup.vim
+++ b/autoload/vimspector/internal/neopopup.vim
@@ -83,6 +83,9 @@ endfunction
 function! vimspector#internal#neopopup#Confirm( confirm_id,
                                               \ text,
                                               \ default_value ) abort
+
+  " Neovim doesn't have an equivalent of popup_dialog, and it's way too much
+  " effort to write one, so we just use confirm().
   let result = confirm( a:text, '&Yes &No &Default', 3 )
 
   " Map the results to what popup_menu_filter would return (ok s:ConfirmCallback
diff --git a/autoload/vimspector/internal/popup.vim b/autoload/vimspector/internal/popup.vim
index e8658ab..5978987 100644
--- a/autoload/vimspector/internal/popup.vim
+++ b/autoload/vimspector/internal/popup.vim
@@ -32,9 +32,32 @@ function! vimspector#internal#popup#HideSplash( id ) abort
   call popup_hide( a:id )
 endfunction
 
+let s:current_selection = 0
+let s:selections = []
+let s:text = []
+
+function! s:UpdatePopup( id )
+  let buf = copy( s:text )
+  call extend( buf, s:DrawButtons() )
+  call popup_settext( a:id, buf )
+endfunction
+
 function! s:YesNoDefaultFilter( default_value, id, key ) abort
-  if a:key ==# "\<CR>" || a:key ==# 'D' || a:key ==# 'd'
+  if a:key ==# "\<CR>"
+    call popup_close( a:id, s:current_selection + 1 )
+    return 1
+  elseif a:key ==# 'D' || a:key ==# 'd'
     call popup_close( a:id, a:default_value )
+    return 1
+  elseif index( [ "\<Tab>", "\<Right>" ], a:key ) >= 0
+    let s:current_selection = ( s:current_selection + 1 ) % len( s:selections )
+    call s:UpdatePopup( a:id )
+    return 1
+  elseif index( [ "\<S-Tab>", "\<Left>" ], a:key ) >= 0
+    let s:current_selection = s:current_selection == 0
+          \ ? len( s:selections ) - 1: s:current_selection - 1
+    call s:UpdatePopup( a:id )
+    return 1
   endif
 
   return popup_filter_yesno( a:id, a:key )
@@ -46,23 +69,68 @@ function! s:ConfirmCallback( confirm_id, id, result ) abort
         \ int( vim.eval( 'a:result' ) ) )
 endfunction
 
+function! s:SelectionPosition( idx ) abort
+  return a:idx == 0 ? 0 : len( join( s:selections[ : a:idx - 1 ], ' ' ) ) + 1
+endfunction
+
+function! s:DrawButtons() abort
+  return [ {
+        \ 'text': join( s:selections, ' ' ),
+        \ 'props': [
+          \   {
+          \      'col': s:SelectionPosition( s:current_selection ) + 1,
+          \      'length': len( s:selections[ s:current_selection ] ),
+          \      'type': 'VimspectorSelectedItem'
+          \   },
+          \ ]
+        \ } ]
+endfunction
+
 function! vimspector#internal#popup#Confirm(
       \ confirm_id,
       \ text,
+      \ options,
       \ default_value ) abort
-  let text = a:text
-  if type( a:text ) != v:t_list
-    let text = [ a:text ]
+
+  silent! call prop_type_add( 'VimspectorSelectedItem', {
+        \ 'highlight': 'PMenuSel'
+        \ } )
+
+  let lines = split( a:text, "\n", v:true )
+  let buf = []
+  for line in lines
+    call add( buf, { 'text': line, 'props': [] } )
+  endfor
+
+  call add( buf, { 'text': '', 'props': [] } )
+
+  let s:selections = a:options
+  let s:current_selection = ( a:default_value - 1 )
+
+  let s:text = copy( buf )
+  call extend( buf, s:DrawButtons() )
+
+  let config = {
+        \   'callback': function( 's:ConfirmCallback', [ a:confirm_id ] ),
+        \   'filter': function( 's:YesNoDefaultFilter', [ a:default_value ] ),
+        \   'mapping': v:false,
+        \ }
+  let config = vimspector#internal#popup#SetBorderChars( config )
+
+  return popup_dialog( buf, config  )
+endfunction
+
+function! vimspector#internal#popup#SetBorderChars( config )
+  " When ambiwidth is single, use prettier characters for the border. This
+  " would look silly when ambiwidth is double.
+  if &ambiwidth ==# 'single' && &encoding ==? 'utf-8'
+    let a:config[ 'borderchars' ] = [ '─', '│', '─', '│', '╭', '╮', '┛', '╰' ]
   endif
 
-  call extend( text, [ '', '(Y)es (N)o (D)efault' ] )
-
-  return popup_dialog( text, {
-        \   'callback': function( 's:ConfirmCallback', [ a:confirm_id ] ),
-        \   'filter': function( 's:YesNoDefaultFilter', [ a:default_value ] )
-        \ } )
+  return a:config
 endfunction
 
+
 " Boilerplate {{{
 let &cpoptions=s:save_cpo
 unlet s:save_cpo
diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index 5aefc37..290ca2e 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -390,13 +390,17 @@ def ConfirmCallback( confirm_id, result ):
   handler( result )
 
 
-def Confirm( api_prefix, prompt, handler, default_value = 1 ):
+def Confirm( api_prefix, prompt, handler, default_value = 3, options = None ):
   global CONFIRM_ID
+  if not options:
+    options = [ '(Y)es', '(N)o', '(D)efault' ]
+
   CONFIRM_ID += 1
   CONFIRM[ CONFIRM_ID ] = handler
   Call( f'vimspector#internal#{ api_prefix }popup#Confirm',
         CONFIRM_ID,
         prompt,
+        options,
         default_value )
 
 

From 5c8143a710a99a691ce4fc53900d37b68800b9df Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Mon, 8 Mar 2021 23:00:45 +0000
Subject: [PATCH 07/13] Add vertical (i.e. narrow) layout

This puts the 3 utility windows at the top, horizontally split, with the
code view below.  The terminal window is drawn either vertically split
(if there's room) or horizontally split otherwise.  The output window
remains at tht bottom.

We add equivalent sizing options too, setting some defauts that roughly
work on my macbook pro.

By default we switch to the narrow layout if there are fewer than 160
columns, but this can be overridden by setting g:vimspector_ui_mode.
---
 python3/vimspector/debug_session.py | 72 +++++++++++++++++++++++++++++
 python3/vimspector/settings.py      | 19 ++++++--
 python3/vimspector/terminal.py      | 23 ++++++++-
 3 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 03874f3..e3f5530 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -661,6 +661,18 @@ class DebugSession( object ):
     vim.command( 'tab split' )
     self._uiTab = vim.current.tabpage
 
+    mode = settings.Get( 'ui_mode' )
+
+    if mode == 'auto':
+      mode = 'vertical' if vim.options[ 'columns' ] < 160 else 'horizontal'
+
+    if mode == 'vertical':
+      self._SetUpUIVertical()
+    else:
+      self._SetUpUIHorizontal()
+
+
+  def _SetUpUIHorizontal( self ):
     # Code window
     code_window = vim.current.window
     self._codeView = code.CodeView( code_window, self._api_prefix )
@@ -701,6 +713,66 @@ class DebugSession( object ):
     # TODO: If/when we support multiple sessions, we'll need some way to
     # indicate which tab was created and store all the tabs
     vim.vars[ 'vimspector_session_windows' ] = {
+      'mode': 'horizontal',
+      'tabpage': self._uiTab.number,
+      'code': utils.WindowID( code_window, self._uiTab ),
+      'stack_trace': utils.WindowID( stack_trace_window, self._uiTab ),
+      'variables': utils.WindowID( vars_window, self._uiTab ),
+      'watches': utils.WindowID( watch_window, self._uiTab ),
+      'output': utils.WindowID( output_window, self._uiTab ),
+      'eval': None # this is going to be updated every time eval popup is opened
+    }
+    with utils.RestoreCursorPosition():
+      with utils.RestoreCurrentWindow():
+        with utils.RestoreCurrentBuffer( vim.current.window ):
+          vim.command( 'doautocmd User VimspectorUICreated' )
+
+
+  def _SetUpUIVertical( self ):
+    # Code window
+    code_window = vim.current.window
+    self._codeView = code.CodeView( code_window, self._api_prefix )
+
+    # Call stack
+    vim.command(
+      f'topleft { settings.Int( "topbar_height" ) }new' )
+    stack_trace_window = vim.current.window
+    one_third = int( vim.eval( 'winwidth( 0 )' ) ) / 3
+    self._stackTraceView = stack_trace.StackTraceView( self,
+                                                       stack_trace_window )
+
+
+    # Watches
+    vim.command( 'leftabove vertical new' )
+    watch_window = vim.current.window
+
+    # Variables
+    vim.command( 'leftabove vertical new' )
+    vars_window = vim.current.window
+
+
+    with utils.LetCurrentWindow( vars_window ):
+      vim.command( f'{ one_third }wincmd |' )
+    with utils.LetCurrentWindow( watch_window ):
+      vim.command( f'{ one_third }wincmd |' )
+    with utils.LetCurrentWindow( stack_trace_window ):
+      vim.command( f'{ one_third }wincmd |' )
+
+    self._variablesView = variables.VariablesView( vars_window,
+                                                   watch_window )
+
+
+    # Output/logging
+    vim.current.window = code_window
+    vim.command( f'rightbelow { settings.Int( "bottombar_height" ) }new' )
+    output_window = vim.current.window
+    self._outputView = output.DAPOutputView( output_window,
+                                             self._api_prefix )
+
+    # TODO: If/when we support multiple sessions, we'll need some way to
+    # indicate which tab was created and store all the tabs
+    vim.vars[ 'vimspector_session_windows' ] = {
+      'mode': 'vertical',
       'tabpage': self._uiTab.number,
       'code': utils.WindowID( code_window, self._uiTab ),
       'stack_trace': utils.WindowID( stack_trace_window, self._uiTab ),
diff --git a/python3/vimspector/settings.py b/python3/vimspector/settings.py
index 9ad9e41..e9e76ea 100644
--- a/python3/vimspector/settings.py
+++ b/python3/vimspector/settings.py
@@ -20,11 +20,20 @@ from vimspector import utils
 
 DEFAULTS = {
   # UI
-  'bottombar_height':  10,
-  'sidebar_width':     50,
-  'code_minwidth':     82,
-  'terminal_maxwidth': 80,
-  'terminal_minwidth': 10,
+  'ui_mode':            'auto',
+  'bottombar_height':   10,
+
+  # For ui_mode = 'horizontal':
+  'sidebar_width':      50,
+  'code_minwidth':      82,
+  'terminal_maxwidth':  80,
+  'terminal_minwidth':  10,
+
+  # For ui_mode = 'vertical':
+  'topbar_height':      15,
+  'code_minheight':     20,
+  'terminal_maxheight': 15,
+  'terminal_minheight': 5,
 
   # Signs
   'sign_priority': {
diff --git a/python3/vimspector/terminal.py b/python3/vimspector/terminal.py
index 6ffd56a..305c8ff 100644
--- a/python3/vimspector/terminal.py
+++ b/python3/vimspector/terminal.py
@@ -23,7 +23,16 @@ def LaunchTerminal( api_prefix,
   env = params.get( 'env' ) or {}
 
   term_options = {
-    'vertical': 1,
+    # Use a vsplit in widw mode, and a horizontal split in narrow mode
+    'vertical': (
+      # Use a vsplit if we're in horizontal mode, or if we're in vertical mode,
+      # but there's enough space for the code and the terminal horizontally
+      # (this gives more vertical space, which becomes at at premium)
+      vim.vars[ 'vimspector_session_windows' ][ 'mode' ] == 'horizontal' or
+      vim.options[ 'columns' ] >= (
+        settings.Int( 'terminal_maxwidth' ) + settings.Int( 'code_minwidth' )
+      )
+    ),
     'norestore': 1,
     'cwd': cwd,
     'env': env,
@@ -50,13 +59,23 @@ def LaunchTerminal( api_prefix,
     # If we're making a vertical split from the code window, make it no more
     # than 80 columns and no fewer than 10. Also try and keep the code window
     # at least 82 columns
-    if term_options[ 'vertical' ] and not term_options.get( 'curwin', 0 ):
+    if term_options.get( 'curwin', 0 ):
+      pass
+    elif term_options[ 'vertical' ]:
       term_options[ 'term_cols' ] = max(
         min ( int( vim.eval( 'winwidth( 0 )' ) )
                    - settings.Int( 'code_minwidth' ),
               settings.Int( 'terminal_maxwidth' ) ),
         settings.Int( 'terminal_minwidth' )
       )
+    else:
+      term_options[ 'term_rows' ] = max(
+        min ( int( vim.eval( 'winheight( 0 )' ) )
+                   - settings.Int( 'code_minheight' ),
+              settings.Int( 'terminal_maxheight' ) ),
+        settings.Int( 'terminal_minheight' )
+      )
+
 
     buffer_number = int(
       utils.Call(

From 251a0ff3144ea66d0250f61b81df638762cb86da Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Mon, 8 Mar 2021 23:13:32 +0000
Subject: [PATCH 08/13] Try and be a bit smarter in auto mode

---
 python3/vimspector/debug_session.py | 14 +++++++++++++-
 python3/vimspector/terminal.py      |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index e3f5530..f2783fc 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -664,7 +664,19 @@ class DebugSession( object ):
     mode = settings.Get( 'ui_mode' )
 
     if mode == 'auto':
-      mode = 'vertical' if vim.options[ 'columns' ] < 160 else 'horizontal'
+      # Go vertical if there isn't enough horizontal space for at least:
+      #  the left bar width
+      #  + the code min width
+      #  + the terminal min width
+      #  + enough space for a sign column and number column?
+      min_width = ( settings.Int( 'sidebar_width' )
+                    + 1 + 2 + 3
+                    + settings.Int( 'code_minwidth' )
+                    + 1 + settings.Int( 'terminal_minwidth' ) )
+
+      mode = ( 'vertical'
+               if vim.options[ 'columns' ] < min_width
+               else 'horizontal' )
 
     if mode == 'vertical':
       self._SetUpUIVertical()
diff --git a/python3/vimspector/terminal.py b/python3/vimspector/terminal.py
index 305c8ff..08ec735 100644
--- a/python3/vimspector/terminal.py
+++ b/python3/vimspector/terminal.py
@@ -30,7 +30,9 @@ def LaunchTerminal( api_prefix,
       # (this gives more vertical space, which becomes at at premium)
       vim.vars[ 'vimspector_session_windows' ][ 'mode' ] == 'horizontal' or
       vim.options[ 'columns' ] >= (
-        settings.Int( 'terminal_maxwidth' ) + settings.Int( 'code_minwidth' )
+        settings.Int( 'terminal_maxwidth' ) +
+          settings.Int( 'code_minwidth' ) +
+          1 # for the split decoration
       )
     ),
     'norestore': 1,

From e99559f6ad371a6e2d6d5f8476913cd4357822f1 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Wed, 10 Mar 2021 11:12:28 +0000
Subject: [PATCH 09/13] Fix default variable values having substitutions from
 the calculus

---
 python3/vimspector/utils.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index 290ca2e..ca0b80a 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -525,7 +525,6 @@ def _Substitute( template, mapping ):
     if mo.group( 'braceddefault' ) is not None:
       named = mo.group( 'defname' )
       if named not in mapping:
-        ''
         raise MissingSubstitution(
           named,
           mo.group( 'default' ).replace( '\\}', '}' ) )
@@ -567,8 +566,11 @@ def ExpandReferencesInString( orig_s,
         if default_value is None and e.default_value is not None:
           try:
             default_value = _Substitute( e.default_value, mapping )
-          except MissingSubstitution:
-            default_value = e.default_value
+          except MissingSubstitution as e2:
+            if e2.name in calculus:
+              default_value = calculus[ e2.name ]()
+            else:
+              default_value = e.default_value
 
         mapping[ key ] = AskForInput( 'Enter value for {}: '.format( key ),
                                       default_value )

From 81fa79ce58f6f77f6ecbca432e38479d3e2d4333 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Wed, 10 Mar 2021 12:29:40 +0000
Subject: [PATCH 10/13] Add up and down frame mappings

---
 autoload/vimspector.vim             | 14 +++++++++++
 plugin/vimspector.vim               |  5 ++++
 python3/vimspector/debug_session.py |  8 +++++++
 python3/vimspector/stack_trace.py   | 36 +++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+)

diff --git a/autoload/vimspector.vim b/autoload/vimspector.vim
index c4a1756..a0b6c42 100644
--- a/autoload/vimspector.vim
+++ b/autoload/vimspector.vim
@@ -234,6 +234,20 @@ function! vimspector#GoToFrame() abort
   py3 _vimspector_session.ExpandFrameOrThread()
 endfunction
 
+function! vimspector#UpFrame() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.UpFrame()
+endfunction
+
+function! vimspector#DownFrame() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.DownFrame()
+endfunction
+
 function! vimspector#AddWatch( ... ) abort
   if !s:Enabled()
     return
diff --git a/plugin/vimspector.vim b/plugin/vimspector.vim
index 24f8914..75e2baa 100644
--- a/plugin/vimspector.vim
+++ b/plugin/vimspector.vim
@@ -69,6 +69,11 @@ nnoremap <silent> <Plug>VimspectorBalloonEval
 xnoremap <silent> <Plug>VimspectorBalloonEval
       \ :<c-u>call vimspector#ShowEvalBalloon( 1 )<CR>
 
+nnoremap <silent> <Plug>VimspectorUpFrame
+      \ :<c-u>call vimspector#UpFrame()<CR>
+nnoremap <silent> <Plug>VimspectorDownFrame
+      \ :<c-u>call vimspector#DownFrame()<CR>
+
 if s:mappings ==# 'VISUAL_STUDIO'
   nmap <F5>         <Plug>VimspectorContinue
   nmap <S-F5>       <Plug>VimspectorStop
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index f2783fc..b294604 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -577,6 +577,14 @@ class DebugSession( object ):
   def ExpandFrameOrThread( self ):
     self._stackTraceView.ExpandFrameOrThread()
 
+  @IfConnected()
+  def UpFrame( self ):
+    self._stackTraceView.UpFrame()
+
+  @IfConnected
+  def DownFrame( self ):
+    self._stackTraceView.DownCFrame()
+
   def ToggleLog( self ):
     if self._HasUI():
       return self.ShowOutput( 'Vimspector' )
diff --git a/python3/vimspector/stack_trace.py b/python3/vimspector/stack_trace.py
index c32cead..6a3793c 100644
--- a/python3/vimspector/stack_trace.py
+++ b/python3/vimspector/stack_trace.py
@@ -367,6 +367,42 @@ class StackTraceView( object ):
       self._JumpToFrame( frame )
 
 
+
+  def _GetFrameOffset( self, delta ):
+    thread: Thread
+    for thread in self._threads:
+      if thread != self._current_thread:
+        continue
+
+      if not thread.stacktrace:
+        return
+
+      frame_idx = None
+      for index, frame in enumerate( thread.stacktrace ):
+        if frame == self._current_frame:
+          frame_idx = index
+          break
+
+      if frame_idx is not None:
+        target_idx = frame_idx + delta
+        if target_idx >= 0 and target_idx < len( thread.stacktrace ):
+          return thread.stacktrace[ target_idx ]
+
+      break
+
+
+  def UpFrame( self ):
+    frame = self._GetFrameOffset( self, -1 )
+    if frame:
+      self._JumpToFrame( frame, 'up' )
+
+
+  def DownFrame( self ):
+    frame = self._GetFrameOffset( self, 1 )
+    if frame:
+      self._JumpToFrame( frame, 'down' )
+
+
   def AnyThreadsRunning( self ):
     for thread in self._threads:
       if thread.state != Thread.TERMINATED:

From b7ca4586729c84f430e6380390b66c8f836d6842 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Wed, 10 Mar 2021 12:30:14 +0000
Subject: [PATCH 11/13] Make any key press dismiss the keyboard popup

---
 autoload/vimspector/internal/balloon.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/autoload/vimspector/internal/balloon.vim b/autoload/vimspector/internal/balloon.vim
index 23954e6..abe8daf 100644
--- a/autoload/vimspector/internal/balloon.vim
+++ b/autoload/vimspector/internal/balloon.vim
@@ -173,9 +173,13 @@ function! vimspector#internal#balloon#CursorFilter( winid, key ) abort
                 \ . 'line_num = ' . line( '.', a:winid )
                 \ . ')' )
     return 1
+  elseif popup_filter_menu( a:winid, a:key )
+    return 1
+  else
+    " Any other key dismisses the popup
+    call vimspector#internal#balloon#Close()
+    return 1
   endif
-
-  return popup_filter_menu( a:winid, a:key )
 endfunction
 
 " }}}

From 938dce1351ff168fce83522d2608c2f8c49bbc47 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Wed, 10 Mar 2021 12:30:32 +0000
Subject: [PATCH 12/13] FixUp: add test for default-from-calculus

---
 tests/python/Test_ExpandReferencesInDict.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/python/Test_ExpandReferencesInDict.py b/tests/python/Test_ExpandReferencesInDict.py
index 4998350..15fb11b 100644
--- a/tests/python/Test_ExpandReferencesInDict.py
+++ b/tests/python/Test_ExpandReferencesInDict.py
@@ -35,6 +35,7 @@ class TestExpandReferencesInDict( unittest.TestCase ):
       'one': '${one}',
       'two': '${one} and ${two}',
       'three': '${three}',
+      'three_with_default': '${three_with_default:${three\\}}', # uses calculus
       'four': '${four}',
       'five': '${five}',
       'list': [ '*${words}' ],
@@ -58,6 +59,7 @@ class TestExpandReferencesInDict( unittest.TestCase ):
       'one': 'one',
       'two': 'one and TWO',
       'three': '3',
+      'three_with_default': '3',
       'four': 'typed text',
       'five': '5ive!',
       'list': [ 'these', 'are', 'some', 'words' ],

From 208d18ef14eb4288a4ee1a47af89131389900384 Mon Sep 17 00:00:00 2001
From: Ben Jackson <ben.jackson@fidessa.com>
Date: Wed, 10 Mar 2021 12:35:51 +0000
Subject: [PATCH 13/13] Ignore ATTENTION! when removing mappings

---
 support/custom_ui_vimrc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/support/custom_ui_vimrc b/support/custom_ui_vimrc
index a8812cb..2ca9a1d 100644
--- a/support/custom_ui_vimrc
+++ b/support/custom_ui_vimrc
@@ -115,12 +115,16 @@ function! s:OnDebugEnd() abort
 
   let original_buf = bufnr()
   let hidden = &hidden
+  augroup VimspectorSwapExists
+    au!
+    autocmd SwapExists * let v:swapchoice='o'
+  augroup END
 
   try
     set hidden
     for bufnr in keys( s:mapped )
       try
-        execute 'noautocmd buffer' bufnr
+        execute 'buffer' bufnr
         silent! nunmap <buffer> <LocalLeader>dn
         silent! nunmap <buffer> <LocalLeader>ds
         silent! nunmap <buffer> <LocalLeader>df
@@ -136,13 +140,15 @@ function! s:OnDebugEnd() abort
     let &hidden = hidden
   endtry
 
+  au! VimspectorSwapExists
+
   let s:mapped = {}
 endfunction
 
 augroup TestCustomMappings
   au!
   autocmd User VimspectorJumpedToFrame call s:OnJumpToFrame()
-  autocmd User VimspectorDebugEnded call s:OnDebugEnd()
+  autocmd User VimspectorDebugEnded ++nested call s:OnDebugEnd()
 augroup END
 
 " }}}