Allow for persistent code evaluation in the watch window.

After ":VdebugEval! code", continue to evaluate code in the watch window
after running through the code. Clear with ":VdebugEval!".

Author: Benji Fisher

plugin/python/start_vdebug.py

@@ -120,6 +120,14 @@ def eval_under_cursor(self):
         except Exception as e:
             self.handle_exception(e)
 
+    def save_eval(self,args):
+        """Save a code snippet for later display in the watch window.
+        """
+        try:
+            return self.runner.save_code(args)
+        except Exception as e:
+            self.handle_exception(e)
+
     def toggle_breakpoint_window(self):
         """Open or close the breakpoint window.
         """

plugin/python/vdebug/runner.py

@@ -22,6 +22,7 @@ def __init__(self):
         self.breakpoints = vdebug.breakpoint.Store()
         self.keymapper = vdebug.util.Keymapper()
         self.ui = vdebug.ui.vimui.Ui(self.breakpoints)
+        self.saved_code = ''
 
     def open(self):
         """ Open the connection and debugging vdebug.ui.
@@ -87,6 +88,12 @@ def set_features(self):
                 error_str = "Failed to set feature %s: %s" %(name,str(e.args[0]))
                 self.ui.error(error_str)
 
+    def save_code(self,code):
+        """Save a code snippet for later display in the watch window.
+        """
+        self.saved_code = code
+        return code
+
     def refresh(self,status):
         """The main action performed after a deubugger step.
     
@@ -121,7 +128,10 @@ def refresh(self,status):
                         self.cur_file,\
                         self.cur_lineno)
 
-                self.get_context(0)
+                if self.saved_code != '':
+                    self.eval(self.saved_code)
+                else:
+                    self.get_context(0)
 
     def get_context(self,context_id = 0):
         self.ui.watchwin.clean()

plugin/vdebug.vim

@@ -115,7 +115,7 @@ command! -nargs=? -complete=customlist,s:BreakpointTypes Breakpoint python debug
 command! VdebugStart python debugger.run()
 command! -nargs=? BreakpointRemove python debugger.remove_breakpoint(<q-args>)
 command! BreakpointWindow python debugger.toggle_breakpoint_window()
-command! -nargs=? VdebugEval python debugger.handle_eval(<q-args>)
+command! -nargs=? -bang VdebugEval call s:HandleEval('<bang>', <q-args>)
 command! -nargs=+ -complete=customlist,s:OptionNames VdebugOpt python debugger.handle_opt(<f-args>)
 
 " Signs and highlighted lines for breakpoints, etc.
@@ -137,6 +137,16 @@ function! s:BreakpointTypes(A,L,P)
     endif
 endfunction
 
+function! s:HandleEval(bang,code)
+    let code = escape(a:code,'"')
+    if strlen(a:bang)
+        execute 'python debugger.save_eval("'.code.'")'
+    endif
+    if strlen(a:code)
+        execute 'python debugger.handle_eval("'.code.'")'
+    endif
+endfunction
+
 " Reload options dictionary, by merging with default options.
 "
 " This should be called if you want to update the options after vdebug has