Compare commits

..

3 Commits

4 changed files with 6 additions and 8 deletions

View File

@ -24,7 +24,7 @@ return {
function(cmp) function(cmp)
if cmp.is_visible() then if cmp.is_visible() then
cmp.cancel() cmp.cancel()
if cmp.get_selected_item_idx() ~= nil then if cmp.get_selected_item_idx() ~= nil or cmp.snippet_active() then
return true return true
end end
end end

View File

@ -29,6 +29,7 @@ return {
init = function() init = function()
local ga = require("gitsigns.actions") local ga = require("gitsigns.actions")
vim.keymap.set("n", "gs", ga.stage_hunk, { desc = "(Un)stage hunk" }) vim.keymap.set("n", "gs", ga.stage_hunk, { desc = "(Un)stage hunk" })
vim.keymap.set("n", "gS", ga.stage_buffer, { desc = "Stage buffer" })
vim.keymap.set("v", "gs", function() vim.keymap.set("v", "gs", function()
ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
end, { desc = "(Un)stage selection" }) end, { desc = "(Un)stage selection" })
@ -39,6 +40,7 @@ return {
vim.keymap.set("n", "gb", ga.blame_line, { desc = "View blame" }) vim.keymap.set("n", "gb", ga.blame_line, { desc = "View blame" })
vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" }) vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" })
vim.keymap.set("n", "<leader>gR", ga.reset_buffer, { desc = "Reset buffer" })
vim.keymap.set("v", "<leader>gr", function() vim.keymap.set("v", "<leader>gr", function()
ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
end, { desc = "Reset selection" }) end, { desc = "Reset selection" })

View File

@ -3,10 +3,5 @@ return {
-- Adds a command to automatically detect the indentation settings -- Adds a command to automatically detect the indentation settings
-- Prefer to use .editorconfig for projects and modeline for files -- Prefer to use .editorconfig for projects and modeline for files
"NMAC427/guess-indent.nvim", "NMAC427/guess-indent.nvim",
keys = { opts = {},
{ "<leader>gi", "<cmd>GuessIndent<cr>", desc = "Guess indentation" },
},
opts = {
auto_cmd = false,
},
} }

View File

@ -48,7 +48,8 @@ return {
-- TODO: Only make a category show up if there actually are any keybinds under it -- TODO: Only make a category show up if there actually are any keybinds under it
require("which-key").add({ require("which-key").add({
{ "<leader>b", group = "Buffer" }, { "<leader>b", group = "Buffer" },
{ "<leader>d", group = "Document" }, { "<leader>d", group = "Doument" },
{ "<leader>g", group = "Git" },
{ "<leader>t", group = "Toggle" }, { "<leader>t", group = "Toggle" },
{ "<leader>s", group = "Search" }, { "<leader>s", group = "Search" },
{ "gr", group = "LSP" }, { "gr", group = "LSP" },