Browse Source

Remove nvim-treesitter-textobjects file

master
Tovi Jaeschke-Rogers 10 months ago
parent
commit
2d7ff3e5c7
4 changed files with 27 additions and 115 deletions
  1. +12
    -12
      .config/nvim/lua/tovi/core/remaps.lua
  2. +15
    -2
      .config/nvim/lua/tovi/plugins/copilot.lua
  3. +0
    -100
      .config/nvim/lua/tovi/plugins/nvim-treesitter-textobjects.lua
  4. +0
    -1
      .config/nvim/lua/tovi/plugins/telescope.lua

+ 12
- 12
.config/nvim/lua/tovi/core/remaps.lua View File

@ -26,18 +26,18 @@ vim.keymap.set("n", "<F7>", function()
end, { desc = "Restore session automatically created on VimLeave" })
-- Navigating with guides
vim.keymap.set(
"n",
"<leader><leader>",
'<Esc>/<++><Enter>"_c4l',
{ desc = "Find next <++> in file and enter insert mode" }
)
vim.keymap.set(
"v",
"<leader><leader>",
'<Esc>/<++><Enter>"_c4l',
{ desc = "Find next <++> in file and enter insert mode" }
)
-- vim.keymap.set(
-- "n",
-- "<leader><leader>",
-- '<Esc>/<++><Enter>"_c4l',
-- { desc = "Find next <++> in file and enter insert mode" }
-- )
-- vim.keymap.set(
-- "v",
-- "<leader><leader>",
-- '<Esc>/<++><Enter>"_c4l',
-- { desc = "Find next <++> in file and enter insert mode" }
-- )
-- Spell-check
vim.keymap.set("n", "<leader>o", "<cmd>setlocal spell! spelllang=en_au<CR>", { desc = "Toggle spell check" })


+ 15
- 2
.config/nvim/lua/tovi/plugins/copilot.lua View File

@ -1,7 +1,20 @@
return {
"github/copilot.vim",
config = function()
vim.api.nvim_set_keymap("i", ",,", 'copilot#Accept("<CR>")', { expr = true, silent = true })
vim.api.nvim_set_keymap("n", "<leader>cs", "<cmd>Copilot panel<CR>", { noremap = true })
vim.api.nvim_set_keymap(
"i",
"<C-r>",
'copilot#Accept("<CR>")',
{ expr = true, silent = true }
)
vim.api.nvim_set_keymap(
"n",
"<leader>cs",
"<cmd>Copilot panel<CR>",
{ noremap = true }
)
vim.g.copilot_no_tab_map = true
end,
}

+ 0
- 100
.config/nvim/lua/tovi/plugins/nvim-treesitter-textobjects.lua View File

@ -1,100 +0,0 @@
return {
lazy = false,
enabled = true,
dependencies = { "nvim-treesitter/nvim-treesitter" },
config = function()
require("nvim-treesitter.configs").setup({
incremental_selection = {
enable = true,
keymaps = {
-- mappings for incremental selection (visual mappings)
init_selection = "gnn", -- maps in normal mode to init the node/scope selection
node_incremental = "grn", -- increment to the upper named parent
scope_incremental = "grc", -- increment to the upper scope (as defined in locals.scm)
node_decremental = "grm", -- decrement to the previous node
},
},
textobjects = {
-- syntax-aware textobjects
enable = true,
lsp_interop = {
enable = true,
peek_definition_code = {
["af"] = "@function.outer",
["if"] = "@class.outer",
},
},
keymaps = {
["iL"] = {
-- you can define your own textobjects directly here
go = "(function_definition) @function",
},
-- or you use the queries from supported languages with textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["aC"] = "@class.outer",
["iC"] = "@class.inner",
["ac"] = "@conditional.outer",
["ic"] = "@conditional.inner",
["ae"] = "@block.outer",
["ie"] = "@block.inner",
["al"] = "@loop.outer",
["il"] = "@loop.inner",
["is"] = "@statement.inner",
["as"] = "@statement.outer",
["ad"] = "@comment.outer",
["am"] = "@call.outer",
["im"] = "@call.inner",
},
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
["]m"] = "@function.outer",
["]]"] = "@class.outer",
},
goto_next_end = {
["]M"] = "@function.outer",
["]["] = "@class.outer",
},
goto_previous_start = {
["[m"] = "@function.outer",
["[["] = "@class.outer",
},
goto_previous_end = {
["[M"] = "@function.outer",
["[]"] = "@class.outer",
},
},
select = {
enable = true,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = "@class.inner",
-- Or you can define your own textobjects like this
["iF"] = {
python = "(function_definition) @function",
cpp = "(function_definition) @function",
c = "(function_definition) @function",
java = "(method_declaration) @function",
go = "(method_declaration) @function",
},
},
},
swap = {
enable = true,
swap_next = {
["<leader>a"] = "@parameter.inner",
},
swap_previous = {
["<leader>A"] = "@parameter.inner",
},
},
},
})
end,
}

+ 0
- 1
.config/nvim/lua/tovi/plugins/telescope.lua View File

@ -122,7 +122,6 @@ return {
keymap.set("n", "<leader>ch", builtin.command_history, { desc = "Fuzzy find recent commands" })
keymap.set("n", "<leader>gb", git_branches, { desc = "Fuzzy find git branches" })
-- keymap.set("n", "<leader>gs", builtin.git_status, { desc = "Fuzzy find current git status" })
keymap.set("n", "<leader>df", function()
builtin.find_files({


Loading…
Cancel
Save