Skip to content

feat(nvim): migrate treesitter to main branch and add textobjects #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chagui merged 3 commits into from
Apr 4, 2026
+120 −35
Merged

feat(nvim): migrate treesitter to main branch and add textobjects #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f904081
feat(nvim): migrate nvim-treesitter to main branch for Neovim 0.12
chagui Apr 4, 2026
ba24c66
feat(nvim): add treesitter textobjects for structural editing
chagui Apr 4, 2026
a5670c0
chore(brew): add tree-sitter CLI to Brewfile
chagui Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .chezmoiscripts/run_once_before_00_init.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ brew "terraformer"
brew "tfenv"
brew "tgenv"
brew "tmux"
brew "tree-sitter"
brew "toilet"
brew "topgrade"
brew "watch"
Expand Down
34 changes: 0 additions & 34 deletions dot_config/nvim/after/plugin/treesitter.lua
View file
Open in desktop

This file was deleted.

120 changes: 119 additions & 1 deletion dot_config/nvim/lua/plugins/code.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,126 @@ return {
},

-- Treesitter
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
{
"nvim-treesitter/nvim-treesitter",
branch = "main",
build = ":TSUpdate",
config = function()
require("nvim-treesitter").install({
"bash",
"c",
"cmake",
"dockerfile",
"dot",
"go",
"gotmpl",
"hcl",
"json",
"lua",
"make",
"python",
"rust",
"terraform",
"toml",
"yaml",
})
vim.api.nvim_create_autocmd("FileType", {
callback = function(args)
local buf = args.buf
local lang = vim.treesitter.language.get_lang(args.match)
if not lang or not pcall(vim.treesitter.start, buf, lang) then
return
end
vim.wo[0].foldmethod = "expr"
vim.wo[0].foldexpr = "v:lua.vim.treesitter.foldexpr()"
vim.bo[buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end,
})
end,
},
{ "nvim-treesitter/nvim-treesitter-context", dependencies = "nvim-treesitter/nvim-treesitter" },
{
"nvim-treesitter/nvim-treesitter-textobjects",
branch = "main",
dependencies = "nvim-treesitter/nvim-treesitter",
config = function()
local select = require("nvim-treesitter-textobjects.select")
local move = require("nvim-treesitter-textobjects.move")
local swap = require("nvim-treesitter-textobjects.swap")
local ts_repeat = require("nvim-treesitter-textobjects.repeatable_move")

require("nvim-treesitter-textobjects").setup({
select = {
lookahead = true,
selection_modes = {
["@parameter.outer"] = "v",
["@function.outer"] = "V",
["@class.outer"] = "V",
},
},
move = { set_jumps = true },
})

-- Select
for _, mode in ipairs({ "x", "o" }) do
vim.keymap.set(mode, "af", function()
select.select_textobject("@function.outer", "textobjects")
end, { desc = "a function" })
vim.keymap.set(mode, "if", function()
select.select_textobject("@function.inner", "textobjects")
end, { desc = "inner function" })
vim.keymap.set(mode, "ac", function()
select.select_textobject("@class.outer", "textobjects")
end, { desc = "a class" })
vim.keymap.set(mode, "ic", function()
select.select_textobject("@class.inner", "textobjects")
end, { desc = "inner class" })
vim.keymap.set(mode, "aa", function()
select.select_textobject("@parameter.outer", "textobjects")
end, { desc = "a argument" })
vim.keymap.set(mode, "ia", function()
select.select_textobject("@parameter.inner", "textobjects")
end, { desc = "inner argument" })
end

-- Move
local move_maps = {
["]m"] = { move.goto_next_start, "@function.outer", "Next function start" },
["]M"] = { move.goto_next_end, "@function.outer", "Next function end" },
["[m"] = { move.goto_previous_start, "@function.outer", "Prev function start" },
["[M"] = { move.goto_previous_end, "@function.outer", "Prev function end" },
["]]"] = { move.goto_next_start, "@class.outer", "Next class start" },
["]["] = { move.goto_next_end, "@class.outer", "Next class end" },
["[["] = { move.goto_previous_start, "@class.outer", "Prev class start" },
["[]"] = { move.goto_previous_end, "@class.outer", "Prev class end" },
["]a"] = { move.goto_next_start, "@parameter.outer", "Next argument" },
["[a"] = { move.goto_previous_start, "@parameter.outer", "Prev argument" },
["]d"] = { move.goto_next, "@conditional.outer", "Next conditional" },
["[d"] = { move.goto_previous, "@conditional.outer", "Prev conditional" },
}
for key, val in pairs(move_maps) do
vim.keymap.set({ "n", "x", "o" }, key, function()
val[1](val[2], "textobjects")
end, { desc = val[3] })
end

-- Swap
vim.keymap.set("n", "<leader>a", function()
swap.swap_next("@parameter.inner")
end, { desc = "Swap next argument" })
vim.keymap.set("n", "<leader>A", function()
swap.swap_previous("@parameter.inner")
end, { desc = "Swap prev argument" })

-- Repeatable moves with ; and ,
vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat.repeat_last_move_next)
vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat.repeat_last_move_previous)
vim.keymap.set({ "n", "x", "o" }, "f", ts_repeat.builtin_f_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "F", ts_repeat.builtin_F_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "t", ts_repeat.builtin_t_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "T", ts_repeat.builtin_T_expr, { expr = true })
end,
},

-- LSP
{
Expand Down
Loading