Fix nvim-dap not lazy loading (#1216)
* Fix nvim-dap not lazy loading The keys property had local variables 'dap' and 'dap-ui' that used `require` and prevented all DAP related plugins from lazy-loading. Fixed this by changing keys to a table and substituting the local variables with a lamba function * Make debug keybind descriptions more consistent
This commit is contained in:
		
							parent
							
								
									e5dc5f6d1c
								
							
						
					
					
						commit
						9dfb1b230f
					
				|  | @ -24,28 +24,59 @@ return { | ||||||
|     -- Add your own debuggers here |     -- Add your own debuggers here | ||||||
|     'leoluz/nvim-dap-go', |     'leoluz/nvim-dap-go', | ||||||
|   }, |   }, | ||||||
|   keys = function(_, keys) |   keys = { | ||||||
|     local dap = require 'dap' |     -- Basic debugging keymaps, feel free to change to your liking! | ||||||
|     local dapui = require 'dapui' |     { | ||||||
|     return { |       '<F5>', | ||||||
|       -- Basic debugging keymaps, feel free to change to your liking! |       function() | ||||||
|       { '<F5>', dap.continue, desc = 'Debug: Start/Continue' }, |         require('dap').continue() | ||||||
|       { '<F1>', dap.step_into, desc = 'Debug: Step Into' }, |       end, | ||||||
|       { '<F2>', dap.step_over, desc = 'Debug: Step Over' }, |       desc = 'Debug: Start/Continue', | ||||||
|       { '<F3>', dap.step_out, desc = 'Debug: Step Out' }, |     }, | ||||||
|       { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' }, |     { | ||||||
|       { |       '<F1>', | ||||||
|         '<leader>B', |       function() | ||||||
|         function() |         require('dap').step_into() | ||||||
|           dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') |       end, | ||||||
|         end, |       desc = 'Debug: Step Into', | ||||||
|         desc = 'Debug: Set Breakpoint', |     }, | ||||||
|       }, |     { | ||||||
|       -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. |       '<F2>', | ||||||
|       { '<F7>', dapui.toggle, desc = 'Debug: See last session result.' }, |       function() | ||||||
|       unpack(keys), |         require('dap').step_over() | ||||||
|     } |       end, | ||||||
|   end, |       desc = 'Debug: Step Over', | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       '<F3>', | ||||||
|  |       function() | ||||||
|  |         require('dap').step_out() | ||||||
|  |       end, | ||||||
|  |       desc = 'Debug: Step Out', | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       '<leader>b', | ||||||
|  |       function() | ||||||
|  |         require('dap').toggle_breakpoint() | ||||||
|  |       end, | ||||||
|  |       desc = 'Debug: Toggle Breakpoint', | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       '<leader>B', | ||||||
|  |       function() | ||||||
|  |         require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') | ||||||
|  |       end, | ||||||
|  |       desc = 'Debug: Set Breakpoint', | ||||||
|  |     }, | ||||||
|  |     -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. | ||||||
|  |     { | ||||||
|  |       '<F7>', | ||||||
|  |       function() | ||||||
|  |         require('dapui').toggle() | ||||||
|  |       end, | ||||||
|  |       desc = 'Debug: See last session result.', | ||||||
|  |     }, | ||||||
|  |   }, | ||||||
|   config = function() |   config = function() | ||||||
|     local dap = require 'dap' |     local dap = require 'dap' | ||||||
|     local dapui = require 'dapui' |     local dapui = require 'dapui' | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Anjishnu Banerjee
						Anjishnu Banerjee