From fb69766f5701c3a579c619730bfa7cff3ce74623 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Tue, 28 May 2024 22:00:30 +0200 Subject: Replace comment with ts-comments --- fnl/plugins/comment.fnl | 35 ----------------------------------- fnl/plugins/ts-comments.fnl | 3 +++ lazy-lock.json | 1 + 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 fnl/plugins/comment.fnl create mode 100644 fnl/plugins/ts-comments.fnl diff --git a/fnl/plugins/comment.fnl b/fnl/plugins/comment.fnl deleted file mode 100644 index 66abb33..0000000 --- a/fnl/plugins/comment.fnl +++ /dev/null @@ -1,35 +0,0 @@ -;; Language aware commenting. - -(local opts {:toggler {;; Line-comment toggle keymap - :line :mcc - ;; Block-comment toggle keymap - :block :mbc} - ;; LHS of operator-pending mappings in NORMAL and VISUAL mode - :opleader {;; Line-comment keymap - :line :mc - ;; Block-comment keymap - :block :mb} - ;; LHS of extra mappings - :extra {;; Add comment on the line above - :above :mcO - ;; Add comment on the line below - :below :mco - ;; Add comment at the end of line - :eol :mcA}}) - -(local user-cmds [[:CommentNormal - (lambda [] - (let [comment-api (require :Comment.api)] - (comment-api.toggle.linewise.current))) - {:nargs 0}] - [:CommentVisual - (lambda [] - (let [comment-api (require :Comment.api)] - (comment-api.toggle.linewise (vim.fn.visualmode)))) - {:nargs 0}]]) - -(fn init [] - (let [cmds (require :util.cmds)] - (cmds.create-user-cmds user-cmds))) - -{1 :numToStr/Comment.nvim :event :BufReadPost : inti : opts} diff --git a/fnl/plugins/ts-comments.fnl b/fnl/plugins/ts-comments.fnl new file mode 100644 index 0000000..d8ce85a --- /dev/null +++ b/fnl/plugins/ts-comments.fnl @@ -0,0 +1,3 @@ +;; Enhance comments with treesitter. + +{1 :folke/ts-comments.nvim :opts {} :event [:BufReadPost :BufNewFile]} diff --git a/lazy-lock.json b/lazy-lock.json index 2e3e3ee..9112cbf 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -61,6 +61,7 @@ "telescope-orgmode.nvim": { "branch": "main", "commit": "a8478496911e378868f44bd9fd5fd5ce5eeec57b" }, "telescope.nvim": { "branch": "master", "commit": "c2ce039188e22288449e43b77710036e69a45a70" }, "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, + "ts-comments.nvim": { "branch": "main", "commit": "f7ded340b4c6b317593b867838bf7ace354a67d4" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" }, -- cgit v1.2.3-70-g09d2