Merge pull request #193 from benjifisher/master

Allow for persistent code evaluation in the watch window.

Author: joonty

doc/Vdebug.txt

@@ -742,19 +742,25 @@ of evaluating expressions: you can either write them yourself
 the source window.
 
 On evaluating an expression, the result is shown in the watch window. To return
-back to the context view, press <F11> (default).
+back to the context view, press <F11> (default). Use |VdebugTrace| to show the
+result in a separate window instead.
 
 ------------------------------------------------------------------------------
-4.5.1 Evaluating any expression                         *VdebugEvalExpression*
+4.5.1 Evaluating any expression          *:VdebugEval!* *VdebugEvalExpression*
 
 To evaluate an expression, use the command :VdebugEval: >
     :VdebugEval <code>
 <
-
-The result is shown on the watch window. E.g: >
-    :VdebugEval $x + 2
+The result is shown in the watch window. By default, when you run code and the
+watch window refreshes, it will return to the context view. If you want to
+change the default behavior, so that your expression is re-evaluated and shown
+in the watch window after running code, then use :VdebugEval!: >
+    :VdebugEval! $x + 2
+<
+To return to the default behavior of the watch window, use :VdebugEval! with
+no argument: >
+    :VdebugEval!
 <
-
 ------------------------------------------------------------------------------
 4.5.2 Evaluating highlighted expressions               *VdebugEvalHighlighted*
 
@@ -779,7 +785,8 @@ request for the history: https://github.com/joonty/vdebug/pull/178.
 If you want to track an expression (any piece of code that can be evaluated)
 or clearly see how a single variable changes through your code's execution,
 you can trace it. At each point that the debugger stops in your code the
-expression will be re-evaluated and displayed in the trace window.
+expression will be re-evaluated and displayed in the trace window. This is
+similar to using |:VdebugEval!| but preserves the default watch window.
 
 To use this feature, when you're connected to the debugger use the command
 :VdebugTrace: >

plugin/python/start_vdebug.py

@@ -128,6 +128,14 @@ def eval_under_cursor(self):
         except Exception, 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>)
 command! -nargs=? VdebugTrace python debugger.handle_trace(<q-args>)
 
@@ -146,6 +146,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