From 7e76c9763d9f81d8917259176f3af8d7475de419 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Sun, 27 May 2018 18:34:39 +0100 Subject: [PATCH] Name the buffers so it's clearer what they do This actually restricts us to a single debugging pane, but that's really already a restriction of the vim-side (only one job, etc.). Support for multiple sessions isn't a priority. --- python3/vimspector/debug_session.py | 4 ++-- python3/vimspector/stack_trace.py | 2 +- python3/vimspector/utils.py | 3 ++- python3/vimspector/variables.py | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py index f44c8fa..76267a2 100644 --- a/python3/vimspector/debug_session.py +++ b/python3/vimspector/debug_session.py @@ -200,7 +200,7 @@ class DebugSession( object ): vim.command( '50vspl' ) vim.command( 'enew' ) self._threadsBuffer = vim.current.buffer - utils.SetUpScratchBuffer( self._threadsBuffer ) + utils.SetUpScratchBuffer( self._threadsBuffer, "vimspector.Threads" ) with utils.TemporaryVimOption( 'eadirection', 'ver' ): with utils.TemporaryVimOption( 'equalalways', 1 ): @@ -215,7 +215,7 @@ class DebugSession( object ): vim.command( 'spl' ) vim.command( 'enew' ) self._outputBuffer = vim.current.buffer - utils.SetUpScratchBuffer( self._outputBuffer ) + utils.SetUpScratchBuffer( self._outputBuffer, 'vimspector.Console' ) # Variables vim.command( 'spl' ) diff --git a/python3/vimspector/stack_trace.py b/python3/vimspector/stack_trace.py index 6d67fe3..84f271f 100644 --- a/python3/vimspector/stack_trace.py +++ b/python3/vimspector/stack_trace.py @@ -24,7 +24,7 @@ class StackTraceView( object ): self._session = session self._connection = connection - utils.SetUpScratchBuffer( self._buf ) + utils.SetUpScratchBuffer( self._buf, 'vimspector.StackTrace' ) vim.current.buffer = self._buf vim.command( 'nnoremap :call vimspector#GoToFrame()' ) diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py index f779b04..b409d80 100644 --- a/python3/vimspector/utils.py +++ b/python3/vimspector/utils.py @@ -29,7 +29,7 @@ def SetUpLogging( logger ): logger.addHandler( handler ) -def SetUpScratchBuffer( buf ): +def SetUpScratchBuffer( buf, name ): buf.options[ 'buftype' ] = 'nofile' buf.options[ 'swapfile' ] = False buf.options[ 'modifiable' ] = False @@ -37,6 +37,7 @@ def SetUpScratchBuffer( buf ): buf.options[ 'readonly' ] = True buf.options[ 'buflisted' ] = False buf.options[ 'bufhidden' ] = 'wipe' + buf.name = name @contextlib.contextmanager diff --git a/python3/vimspector/variables.py b/python3/vimspector/variables.py index a3fc470..c3dd5f4 100644 --- a/python3/vimspector/variables.py +++ b/python3/vimspector/variables.py @@ -21,6 +21,8 @@ from vimspector import utils class VariablesView( object ): def __init__( self, connection, buf ): + vim.current.buffer = buf + self._buf = buf self._connection = connection @@ -47,9 +49,7 @@ class VariablesView( object ): vim.command( 'nnoremap :call vimspector#DeleteWatch()' ) - vim.current.buffer = buf - - utils.SetUpScratchBuffer( self._buf ) + utils.SetUpScratchBuffer( self._buf, 'vimspector.Variables' ) def Clear( self ): with utils.ModifiableScratchBuffer( self._buf ):