From 936c4ae1519c6d30a02d328214f8b797bfbd7738 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Mon, 13 Sep 2021 16:42:33 +0100 Subject: vim-patch:8.2.3417: Vim9: a failing debug expression aborts script sourcing Problem: Vim9: a failing debug expression aborts script sourcing. Solution: Do not let expression failure abort script sourcing. (closes vim/vim#8848) https://github.com/vim/vim/commit/072f1c68884a1e2d468a0f39e27fc28168fb4b03 Vim9script is N/A, exclude Test_Debugger_breakadd_expr. Move debuggy struct to before generated header inclusion so eval_expr_restore prototype works. Add CheckRunVimInTerminal to Test_Debugger_breakadd. Cherry-pick Test_Debugger_breakadd changes from v8.2.1440, v8.2.1736. --- src/nvim/testdir/test_debugger.vim | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test_debugger.vim b/src/nvim/testdir/test_debugger.vim index d1464e9d3b..c6d6a90275 100644 --- a/src/nvim/testdir/test_debugger.vim +++ b/src/nvim/testdir/test_debugger.vim @@ -314,9 +314,12 @@ func Test_Debugger() call RunDbgCmd(buf, 'enew! | only!') call StopVimInTerminal(buf) +endfunc +func Test_Debugger_breakadd() " Tests for :breakadd file and :breakadd here " Breakpoints should be set before sourcing the file + CheckRunVimInTerminal let lines =<< trim END let var1 = 10 @@ -337,6 +340,10 @@ func Test_Debugger() call StopVimInTerminal(buf) call delete('Xtest.vim') + %bw! + + call assert_fails('breakadd here', 'E32:') + call assert_fails('breakadd file Xtest.vim /\)/', 'E55:') endfunc func Test_Backtrace_Through_Source() -- cgit From 31ac33bf772b17d6a0553b97889aeaf3a5227419 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Mon, 13 Sep 2021 17:09:15 +0100 Subject: vim-patch:8.2.3419: a failing debug expression may make Vim unusable Problem: A failing debug expression may make Vim unusable. Solution: Suppress error messages. (closes vim/vim#8848) https://github.com/vim/vim/commit/0325d3967ce7d0fd35bc1472fd476b911b895b76 --- src/nvim/testdir/test_debugger.vim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test_debugger.vim b/src/nvim/testdir/test_debugger.vim index c6d6a90275..a396efc09e 100644 --- a/src/nvim/testdir/test_debugger.vim +++ b/src/nvim/testdir/test_debugger.vim @@ -267,9 +267,7 @@ func Test_Debugger() call RunDbgCmd(buf, 'breakd func a()', ['E475: Invalid argument: func a()']) call RunDbgCmd(buf, 'breakd func a', ['E161: Breakpoint not found: func a']) call RunDbgCmd(buf, 'breakd expr', ['E475: Invalid argument: expr']) - call RunDbgCmd(buf, 'breakd expr x', [ - \ 'E121: Undefined variable: x', - \ 'E161: Breakpoint not found: expr x']) + call RunDbgCmd(buf, 'breakd expr x', ['E161: Breakpoint not found: expr x']) " finish the current function call RunDbgCmd(buf, 'finish', [ -- cgit