From ee0c775a97a99ca2dd907fc00ab120febfbe2781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Fri, 29 Dec 2023 12:25:02 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(nvim):=20add=20various-textobj?= =?UTF-8?q?s=20extra?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/.github/README.md | 2 ++ .config/nvim/lazy-lock.json | 3 ++- .config/nvim/lazyvim.json | 1 + .../coding/treesitter/various-textobjs.lua | 16 ++++++++++++++++ .config/nvim/lua/plugins/extras/lang/sql.lua | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua diff --git a/.config/nvim/.github/README.md b/.config/nvim/.github/README.md index 4dd74eae..d84f07d6 100644 --- a/.config/nvim/.github/README.md +++ b/.config/nvim/.github/README.md @@ -169,6 +169,7 @@ 📝 Editing support - [monaqa/dial.nvim](https://dotfyle.com/plugins/monaqa/dial.nvim) +- [chrisgrieser/nvim-various-textobjs](https://dotfyle.com/plugins/chrisgrieser/nvim-various-textobjs) - [ckolkey/ts-node-action](https://dotfyle.com/plugins/ckolkey/ts-node-action) - [debugloop/telescope-undo.nvim](https://dotfyle.com/plugins/debugloop/telescope-undo.nvim) - [echasnovski/mini.pairs](https://dotfyle.com/plugins/echasnovski/mini.pairs) @@ -260,6 +261,7 @@ - [max397574/better-escape.nvim](https://dotfyle.com/plugins/max397574/better-escape.nvim) - [folke/which-key.nvim](https://dotfyle.com/plugins/folke/which-key.nvim) +- [tris203/hawtkeys.nvim](https://dotfyle.com/plugins/tris203/hawtkeys.nvim) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 1c3cbd51..854695fd 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -84,12 +84,13 @@ "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" }, "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "7a2c6211d6f550988fccd8800de8426d5e480a2d" }, + "nvim-treesitter": { "branch": "master", "commit": "362ebd3a210f20aab80be05557f216cbaf4531e6" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e2d5bd4cbe75849a013901555d436a48c6680cb" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, + "nvim-various-textobjs": { "branch": "main", "commit": "8ebbedb58845d4bce91cfb1db705fb4e942ee333" }, "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" }, "octo.nvim": { "branch": "master", "commit": "b5371003f209764c9d1cc43cf20b6dc52961f0e8" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 7e37ecad..bff20a81 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -18,6 +18,7 @@ "plugins.extras.coding.treesitter.node-action", "plugins.extras.coding.treesitter.puppeteer", "plugins.extras.coding.treesitter.text-case", + "plugins.extras.coding.treesitter.various-textobjs", "plugins.extras.coding.yanky", "plugins.extras.dap.core", "plugins.extras.dap.persistent-breakpoints", diff --git a/.config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua b/.config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua new file mode 100644 index 00000000..3e055b28 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/treesitter/various-textobjs.lua @@ -0,0 +1,16 @@ +return { + "chrisgrieser/nvim-various-textobjs", + opts = { useDefaultKeymaps = false }, + -- stylua: ignore + keys = { + { "im", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("inner") end, desc = "Markdown Link", }, + { "am", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdlink("outer") end, desc = "Markdown Link", }, + { "iC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("inner") end, desc = "CodeBlock", }, + { "aC", ft = { "markdown" }, mode = { "o", "x" }, function() require("various-textobjs").mdFencedCodeBlock("outer") end, desc = "CodeBlock", }, + { "gd", mode = { "o", "x" }, function() require("various-textobjs").diagnostics() end, desc = "Diagnostics", }, + { "iy", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("inner") end, desc = "Triple Quotes", }, + { "ay", ft = { "python" }, mode = { "o", "x" }, function() require("various-textobjs").pyTripleQuotes("outer") end, desc = "Triple Quotes", }, + { "iC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("inner") end, desc = "CSS Selector", }, + { "aC", ft = { "css", "scss", "less" }, mode = { "o", "x" }, function() require("various-textobjs").cssSelector("outer") end, desc = "CSS Selector", }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/lang/sql.lua b/.config/nvim/lua/plugins/extras/lang/sql.lua index 728f9e17..09b004e1 100644 --- a/.config/nvim/lua/plugins/extras/lang/sql.lua +++ b/.config/nvim/lua/plugins/extras/lang/sql.lua @@ -35,7 +35,7 @@ return { "tpope/vim-dadbod", cmd = { "DBUI", "DBUIToggle", "DBUIAddConnection", "DBUIFindBuffer" }, dependencies = { - "kristijanhusak/vim-dadbod-ui", + { "kristijanhusak/vim-dadbod-ui" }, { "kristijanhusak/vim-dadbod-completion", ft = sql_ft }, { "jsborjesson/vim-uppercase-sql", ft = sql_ft }, },