Skip to content

Commit fc550d2

Browse files
committed
refactor(diff-keybindings): Refactor diffkeybindings to use astroui, and fix visual bug
1 parent 31ddaa3 commit fc550d2

File tree

1 file changed

+16
-17
lines changed
  • lua/astrocommunity/pack/diff-keybindings

1 file changed

+16
-17
lines changed
Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
local menu = "<Leader>D"
21
return {
32
{
43
"AstroNvim/astrocore",
54
---@type AstroCoreOpts
6-
opts = {
7-
mappings = {
8-
n = {
9-
[menu] = { desc = " Diff" },
10-
[menu .. "v"] = { "<cmd>vert diffsplit<cr>", desc = " Vertical split diff" },
11-
[menu .. "h"] = { "<cmd>diffsplit<cr>", desc = " Horizontal split diff" },
12-
[menu .. "t"] = { "<cmd>diffthis<cr>", desc = " Diff this" },
13-
[menu .. "p"] = { "<cmd>diffpatch<cr>", desc = " Patch diff" },
14-
[menu .. "u"] = { "<cmd>diffupdate<cr>", desc = "󰚰 Update diff" },
15-
[menu .. "g"] = { "<cmd>diffget<cr>", desc = " Get diff" },
16-
[menu .. "P"] = { "<cmd>diffput<cr>", desc = " Put diff" },
17-
[menu .. "q"] = { "<cmd>diffoff<cr>", desc = "󰘪 Stop diff" },
18-
[menu .. "?"] = { "<cmd>h diff<cr>", desc = "󰋗 Help" },
19-
},
20-
},
21-
},
5+
opts = function(_, opts)
6+
local mappings = assert(opts.mappings)
7+
8+
local prefix = "<Leader>D"
9+
mappings.n[prefix] = { desc = " Diff" }
10+
mappings.n[prefix .. "v"] = { "<cmd>vert diffsplit<cr>", desc = " Vertical split diff" }
11+
mappings.n[prefix .. "h"] = { "<cmd>diffsplit<cr>", desc = " Horizontal split diff" }
12+
mappings.n[prefix .. "t"] = { "<cmd>diffthis<cr>", desc = " Diff this" }
13+
mappings.n[prefix .. "p"] = { "<cmd>diffpatch<cr>", desc = " Patch diff" }
14+
mappings.n[prefix .. "u"] = { "<cmd>diffupdate<cr>", desc = "󰚰 Update diff" }
15+
mappings.n[prefix .. "g"] = { "<cmd>diffget<cr>", desc = " Get diff" }
16+
mappings.n[prefix .. "P"] = { "<cmd>diffput<cr>", desc = " Put diff" }
17+
mappings.n[prefix .. "q"] = { "<cmd>diffoff<cr>", desc = "󰘪 Stop diff" }
18+
mappings.n[prefix .. "?"] = { "<cmd>h diff<cr>", desc = "󰋗 Help" }
19+
end,
2220
},
21+
{ "AstroNvim/astroui", opts = { icons = { Diff = "" } } },
2322
}

0 commit comments

Comments
 (0)