From 9e0b68330e05385ee3770ff9916e497b561fd8e8 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Mon, 28 May 2018 15:48:51 +0100
Subject: [PATCH] Tidy up the buffers and don't switch on new

---
 python3/vimspector/debug_session.py | 1 +
 python3/vimspector/output.py        | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index bbb4a9e..c11799a 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -149,6 +149,7 @@ class DebugSession( object ):
     if self._uiTab:
       self._stackTraceView.Reset()
       self._variablesView.Reset()
+      self._outputView.Reset()
       vim.current.tabpage = self._uiTab
       vim.command( 'tabclose' )
 
diff --git a/python3/vimspector/output.py b/python3/vimspector/output.py
index af3b744..4efce34 100644
--- a/python3/vimspector/output.py
+++ b/python3/vimspector/output.py
@@ -34,9 +34,14 @@ class OutputView( object ):
     with utils.ModifiableScratchBuffer( self._buffers[ category ] ):
       self._buffers[ category ].append( event[ 'output' ].splitlines() )
 
+  def Reset( self ):
+    self.Clear()
+
   def Clear( self ):
     for buf in self._buffers:
-      self._buffers[ buf ] = None
+      vim.command( 'bwipeout! {0}'.format( self._buffers[ buf ].name ) )
+
+    self._buffers.clear()
 
   def ShowOutput( self, category ):
     vim.current.window = self._window
@@ -56,3 +61,5 @@ class OutputView( object ):
       vim.command( "nnoremenu WinBar.{0} "
                    ":call vimspector#ShowOutput( '{0}' )<CR>".format(
                      utils.Escape( category ) ) )
+
+      vim.command( 'bu #' )