mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 8.2.3066: Vim9: debugging lambda does not work
Problem:    Vim9: debugging lambda does not work.
Solution:   Use the compile type of the function when compiling a lambda.
            (closes #8412)
			
			
This commit is contained in:
		| @@ -932,7 +932,7 @@ func Test_Backtrace_DefFunction() | |||||||
|   call delete('Xtest2.vim') |   call delete('Xtest2.vim') | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
| func Test_debug_DefFunction() | func Test_debug_def_and_legacy_function() | ||||||
|   CheckCWD |   CheckCWD | ||||||
|   let file =<< trim END |   let file =<< trim END | ||||||
|     vim9script |     vim9script | ||||||
| @@ -1068,6 +1068,33 @@ func Test_debug_def_function() | |||||||
|   call delete('Xtest.vim') |   call delete('Xtest.vim') | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
|  | func Test_debug_def_function_with_lambda() | ||||||
|  |   CheckCWD | ||||||
|  |   let lines =<< trim END | ||||||
|  |      vim9script | ||||||
|  |      def g:Func() | ||||||
|  |        var s = 'a' | ||||||
|  |        ['b']->map((_, v) => s) | ||||||
|  |        echo "done" | ||||||
|  |      enddef | ||||||
|  |      breakadd func 2 g:Func | ||||||
|  |   END | ||||||
|  |   call writefile(lines, 'XtestLambda.vim') | ||||||
|  |  | ||||||
|  |   let buf = RunVimInTerminal('-S XtestLambda.vim', {}) | ||||||
|  |  | ||||||
|  |   call RunDbgCmd(buf, | ||||||
|  |                 \ ':call g:Func()', | ||||||
|  |                 \ ['function Func', 'line 2: [''b'']->map((_, v) => s)']) | ||||||
|  |   call RunDbgCmd(buf, | ||||||
|  |                 \ 'next', | ||||||
|  |                 \ ['function Func', 'line 3: echo "done"']) | ||||||
|  |  | ||||||
|  |   call RunDbgCmd(buf, 'cont') | ||||||
|  |   call StopVimInTerminal(buf) | ||||||
|  |   call delete('XtestLambda.vim') | ||||||
|  | endfunc | ||||||
|  |  | ||||||
| func Test_debug_backtrace_level() | func Test_debug_backtrace_level() | ||||||
|   CheckCWD |   CheckCWD | ||||||
|   let lines =<< trim END |   let lines =<< trim END | ||||||
|   | |||||||
| @@ -755,6 +755,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     3066, | ||||||
| /**/ | /**/ | ||||||
|     3065, |     3065, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
| @@ -3622,7 +3622,7 @@ compile_lambda(char_u **arg, cctx_T *cctx) | |||||||
|     // compile_return(). |     // compile_return(). | ||||||
|     if (ufunc->uf_ret_type->tt_type == VAR_VOID) |     if (ufunc->uf_ret_type->tt_type == VAR_VOID) | ||||||
| 	ufunc->uf_ret_type = &t_unknown; | 	ufunc->uf_ret_type = &t_unknown; | ||||||
|     compile_def_function(ufunc, FALSE, COMPILE_TYPE(ufunc), cctx); |     compile_def_function(ufunc, FALSE, cctx->ctx_compile_type, cctx); | ||||||
|  |  | ||||||
|     // evalarg.eval_tofree_cmdline may have a copy of the last line and "*arg" |     // evalarg.eval_tofree_cmdline may have a copy of the last line and "*arg" | ||||||
|     // points into it.  Point to the original line to avoid a dangling pointer. |     // points into it.  Point to the original line to avoid a dangling pointer. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user