Skip to content

Commit e84f1a7

Browse files
JavaHelloJavaHello
committed
dap keymap
1 parent 8a45ffc commit e84f1a7

File tree

6 files changed

+83
-20
lines changed

6 files changed

+83
-20
lines changed

‎lua/autocmds.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ autocmd("FileType", {
6767
pattern = {
6868
"oil",
6969
"DressingSelect",
70+
"dap-*"
7071
},
7172
callback = function(event)
7273
vim.keymap.set("n", "q", "<cmd>bd<cr>", { buffer = event.buf, silent = true })
@@ -169,5 +170,14 @@ autocmd("LspDetach", {
169170
end,
170171
})
171172

173+
autocmd("TermOpen", {
174+
group = augroup("close_with_q_term"),
175+
pattern = "*",
176+
callback = function(event)
177+
-- mac 下 t 模式执行 bd! dap 终端会导致 nvim 退出
178+
-- 这里使用 n 模式下执行
179+
vim.keymap.set("n", "q", "<cmd>bd!<cr>", { buffer = event.buf, silent = true })
180+
end,
181+
})
172182

173183
require("kide.melspconfig").init_lsp_progress()

‎lua/kide/lsp/sonarlint.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local M = {}
22

33
M.setup = function()
4-
local vscode = require("kide.vscode")
4+
local vscode = require("kide.tools.vscode")
55
local utils = require("kide.tools")
66
local sonarlint_ls = vscode.find_one("/sonarsource.sonarlint-vscode*/server/sonarlint-ls.jar")
77
if not sonarlint_ls then

‎lua/kide/lspui.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ function M.open_info()
3737
" filetype: " .. vim.inspect(client.config.filetypes),
3838
" root_dir: " .. vim.inspect(client.config.root_dir),
3939
" cmd: " .. vim.inspect(client.config.cmd),
40+
"",
4041
})
4142
end
4243
vim.api.nvim_put(client_info, "c", true, true)

‎lua/kide/tools/curl.lua‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@ M.setup = function()
2626
})
2727
end
2828
else
29-
exec({
29+
local cmd = {
3030
"curl",
3131
"-w",
3232
outfmt,
33-
opt.args,
34-
})
33+
}
34+
vim.list_extend(cmd, vim.split(opt.args, " "))
35+
exec(cmd)
3536
end
3637
end, {
3738
nargs = "*",
3839
complete = function()
39-
return { "-vvv" }
40+
return { "-vvv", "--no-sessionid" }
4041
end,
4142
})
4243
end

‎lua/mappings.lua‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,69 @@ map("n", "<C-k>", "<C-w>k", { desc = "switch window up" })
4242
map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
4343

4444
-- dap
45-
map("n", "<leader>db", "<CMD>lua require'dap'.toggle_breakpoint()<CR>", { desc = "Dap toggle breakpoint" })
46-
map(
47-
"n",
48-
"<leader>dB",
49-
"<CMD>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>",
50-
{ desc = "Dap breakpoint condition" }
51-
)
52-
map("n", "<leader>dp", "<CMD>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>", {
53-
desc = "Dap Log point message",
45+
map("n", "<F5>", function()
46+
require("dap").continue()
47+
end, {
48+
desc = "Dap continue",
49+
})
50+
map("n", "<F10>", function()
51+
require("dap").step_over()
52+
end, {
53+
desc = "Dap step_over",
54+
})
55+
map("n", "<F11>", function()
56+
require("dap").step_into()
57+
end, {
58+
desc = "Dap step_into",
5459
})
55-
map("n", "<leader>dl", "<CMD>lua require'dap'.run_last()<CR>", {
60+
map("n", "<F12>", function()
61+
require("dap").step_out()
62+
end, {
63+
desc = "Dap step_out",
64+
})
65+
map("n", "<leader>db", function()
66+
require("dap").toggle_breakpoint()
67+
end, { desc = "Dap toggle breakpoint" })
68+
map("n", "<leader>dB", function()
69+
require("dap").set_breakpoint(vim.fn.input("Breakpoint condition: "))
70+
end, { desc = "Dap breakpoint condition" })
71+
map("n", "<leader>dl", function()
72+
require("dap").run_last()
73+
end, {
5674
desc = "Dap run last",
5775
})
76+
map("n", "<Leader>lp", function()
77+
require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point message: "))
78+
end, {
79+
desc = "Dap set_breakpoint",
80+
})
81+
map("n", "<Leader>dr", function()
82+
require("dap").repl.open()
83+
end, {
84+
desc = "Dap repl open",
85+
})
86+
map({ "n", "v" }, "<Leader>dh", function()
87+
require("dap.ui.widgets").hover()
88+
end, {
89+
desc = "Dap hover",
90+
})
91+
map({ "n", "v" }, "<Leader>dp", function()
92+
require("dap.ui.widgets").preview()
93+
end, {
94+
desc = "Dap preview",
95+
})
96+
map("n", "<Leader>df", function()
97+
local widgets = require("dap.ui.widgets")
98+
widgets.centered_float(widgets.frames)
99+
end, {
100+
desc = "Dap centered_float frames",
101+
})
102+
map("n", "<Leader>dv", function()
103+
local widgets = require("dap.ui.widgets")
104+
widgets.centered_float(widgets.scopes)
105+
end, {
106+
desc = "Dap centered_float scopes",
107+
})
58108

59109
map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "files", silent = true, noremap = true })
60110

@@ -70,10 +120,10 @@ command("TaskRunLast", function()
70120
require("kide.term").input_run(true)
71121
end, { desc = "Restart Last Task" })
72122

73-
map("n", "<C-l>", function()
123+
map("n", "<A-l>", function()
74124
require("conform").format({ lsp_fallback = true })
75125
end, { desc = "format file" })
76-
map("v", "<C-l>", function()
126+
map("v", "<A-l>", function()
77127
vim.api.nvim_feedkeys("\027", "xt", false)
78128
local start_pos = vim.api.nvim_buf_get_mark(0, "<")
79129
local end_pos = vim.api.nvim_buf_get_mark(0, ">")

‎lua/plugins.lua‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,11 @@ return {
266266
dependencies = { "theHamsta/nvim-dap-virtual-text" },
267267
config = function()
268268
local dap = require("dap")
269+
dap.defaults.fallback.focus_terminal = true
269270
require("nvim-dap-virtual-text").setup({})
270-
dap.listeners.after.event_initialized["dapui_config"] = function()
271-
dap.repl.open()
272-
end
271+
-- dap.listeners.after.event_initialized["dapui_config"] = function()
272+
-- dap.repl.open()
273+
-- end
273274
end,
274275
},
275276
{

0 commit comments

Comments
 (0)