Simplify vim options changes

python3/vimspector/debug_session.py

@@ -266,15 +266,17 @@ class DebugSession( object ):
     self._codeView = code.CodeView( vim.current.window )
 
     # Call stack
+    with utils.TemporaryVimOptions( { 'splitright':  False,
+                                      'equalalways': False, } ):
       vim.command( 'topleft 50vspl' )
       vim.command( 'enew' )
       self._stackTraceView = stack_trace.StackTraceView( self,
                                                          self._connection,
                                                          vim.current.buffer )
 
-    with utils.TemporaryVimOption( 'splitbelow', False ):
+    with utils.TemporaryVimOptions( { 'splitbelow':  False,
-      with utils.TemporaryVimOption( 'eadirection', 'ver' ):
+                                      'eadirection': 'ver',
-        with utils.TemporaryVimOption( 'equalalways', 1 ):
+                                      'equalalways': True } ):
       # Watches
       vim.command( 'spl' )
       vim.command( 'enew' )

python3/vimspector/utils.py

@@ -96,6 +96,20 @@ def RestoreCurrentBuffer( window ):
       vim.current.buffer = old_buffer
 
 
+@contextlib.contextmanager
+def TemporaryVimOptions( opts ):
+  old_value = {}
+  try:
+    for option, value in opts.items():
+      old_value[ option ] = vim.options[ option ]
+      vim.options[ option ] = value
+
+    yield
+  finally:
+    for option, value in old_value.items():
+      vim.options[ option ] = value
+
+
 @contextlib.contextmanager
 def TemporaryVimOption( opt, value ):
   old_value = vim.options[ opt ]