summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-10-07 18:51:23 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-07 18:51:23 +0100
commit33b55b562b90e5cc0091fa39d87cd60956c73f57 (patch)
treed0582cab3707790a681635355b4f579dd9801184
parent5ab300195b0831cbdba3ce349416a0e6a218e4ef (diff)
patch 9.0.0688: debugger does not display the whole commandv9.0.0688
Problem: Debugger does not display the whole command. Solution: Set ea.cmd before checking for a breakpoint.
-rw-r--r--src/ex_docmd.c5
-rw-r--r--src/testdir/test_debugger.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 3ffbf2b906..8ca5ede46b 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 61cd5c98bd..2b405d9209 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 7330eebcfc..2108099bb0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 688,
+/**/
687,
/**/
686,