patch 9.0.0688: debugger does not display the whole command

Problem:    Debugger does not display the whole command.
Solution:   Set ea.cmd before checking for a breakpoint.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 3ffbf2b9064c203f16f4511a2585629ee7b154f1..8ca5ede46bb5e2f0e53058ed2cd04a94ac038c2c 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1889,7 +1889,11 @@ do_one_cmd(
        }
     }
 # endif
+#endif
+
+    ea.cmd = cmd;
 
+#ifdef FEAT_EVAL
     // May go to debug mode.  If this happens and the ">quit" debug command is
     // used, throw an interrupt exception and skip the next command.
     dbg_check_breakpoint(&ea);
@@ -1935,7 +1939,6 @@ do_one_cmd(
 #endif
     }
 
-    ea.cmd = cmd;
     if (!may_have_range)
        ea.line1 = ea.line2 = default_address(&ea);
     else if (parse_cmd_address(&ea, &errormsg, FALSE) == FAIL)

diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index 61cd5c98bd4ee3428b454bd0c041cc7b7d8aea95..2b405d92096f1b1e7dfd98bf23bb5724360febf0 100644 (file)
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -993,7 +993,6 @@ func Test_Backtrace_DefFunction()
   call RunDbgCmd(buf, 'step', ['line 1: vim9script'])
   call RunDbgCmd(buf, 'step', ['line 3: def DoAThing(): number'])
   call RunDbgCmd(buf, 'step', ['line 9: export def File2Function()'])
-  call RunDbgCmd(buf, 'step', ['line 9: def File2Function()'])
   call RunDbgCmd(buf, 'step', ['line 13: defcompile'])
   call RunDbgCmd(buf, 'step', ['line 14: File2Function()'])
   call RunDbgCmd(buf, 'backtrace', [

diff --git a/src/version.c b/src/version.c
index 7330eebcfc94a69682ae6dca0266ca8509ceef31..2108099bb0f58767096b59869af514cd4e7874c1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    688,
 /**/
     687,
 /**/