From 73ee308ac8494e7ea59e887304a27bed54b71255 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Thu, 9 May 2024 22:41:06 -0500 Subject: [PATCH] refactor(nvim): use builtin `:h commenting` for comments --- .../dots/.config/nvim/lua/core/mappings.lua | 4 +- .../nvim/lua/plugins/configs/comment.lua | 51 ------------------- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 users/price/dots/.config/nvim/lua/plugins/configs/comment.lua diff --git a/users/price/dots/.config/nvim/lua/core/mappings.lua b/users/price/dots/.config/nvim/lua/core/mappings.lua index bbcc5726..e664fec9 100755 --- a/users/price/dots/.config/nvim/lua/core/mappings.lua +++ b/users/price/dots/.config/nvim/lua/core/mappings.lua @@ -121,8 +121,8 @@ M.setup = function() vim.keymap.set("n", "", "za", { silent = true, desc = "Toggle Fold" }) -- Alias / to toggle comments - vim.keymap.set("n", "/", "gcc", { silent = true, desc = "Comment: Toggle Line" }) - vim.keymap.set("v", "/", "gc", { silent = true, desc = "Comment: Toggle Selection" }) + vim.keymap.set("n", "/", "gcc", { silent = true, remap = true, desc = "Comment: Toggle Line" }) + vim.keymap.set("v", "/", "gc", { silent = true, remap = true, desc = "Comment: Toggle Selection" }) end return M diff --git a/users/price/dots/.config/nvim/lua/plugins/configs/comment.lua b/users/price/dots/.config/nvim/lua/plugins/configs/comment.lua deleted file mode 100644 index 0b4f52ba..00000000 --- a/users/price/dots/.config/nvim/lua/plugins/configs/comment.lua +++ /dev/null @@ -1,51 +0,0 @@ -return { - { - "numToStr/Comment.nvim", - config = function() - require("Comment").setup({ - pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(), - }) - end, - dependencies = { - { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = function() - vim.g.skip_ts_context_commentstring_module = true - end, - config = function() - require("ts_context_commentstring").setup({ - enable_autocmd = false, - }) - end, - }, - }, - keys = { - { "gc", desc = "> Comment: Line" }, - { "gb", desc = "> Comment: Block " }, - { "gbc", desc = "Comment: Toggle block comment" }, - { "gcc", desc = "Comment: Toggle line comment" }, - { "gcO", desc = "Comment: Add comment on line above" }, - { "gco", desc = "Comment: Add comment on line below" }, - { "gcA", desc = "Comment: Add comment at end of line" }, - { - "/", - function() - local api = require("Comment.api") - api.toggle.linewise.current() - end, - desc = "Comment: Toggle Linewise", - }, - { - "/", - function() - local api = require("Comment.api") - local esc = vim.api.nvim_replace_termcodes("", true, false, true) - vim.api.nvim_feedkeys(esc, "nx", false) - api.toggle.linewise(vim.fn.visualmode()) - end, - desc = "Comment: Toggle Blockwise", - mode = { "x" }, - }, - }, - }, -}