From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 7 Oct 2022 17:51:23 +0000 (+0100)
Subject: patch 9.0.0688: debugger does not display the whole command
X-Git-Tag: v9.0.0688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33b55b562b90e5cc0091fa39d87cd60956c73f57;p=vim

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 3ffbf2b90..8ca5ede46 100644
--- 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 61cd5c98b..2b405d920 100644
--- 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 7330eebcf..2108099bb 100644
--- 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,
 /**/