nvim 0.12 wip

.config/nvim/lua/plugins/treesitter.lua

@@ -1,7 +1,144 @@
-return {
-  "nvim-treesitter/nvim-treesitter",
-  build = ":TSUpdate",
-  config = function()
-    require('nvim-treesitter').install({ 'zig', 'c', 'vim', 'rasi', 'cpp', 'javascript', 'markdown', 'markdown_inline', 'lua' }):wait(300000) -- wait max. 5 minutes
-  end
-}
+vim.pack.add({
+  {
+    src = "https://github.com/nvim-treesitter/nvim-treesitter",
+    version = "main",
+  },
+  {
+    src = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
+    version = "main",
+  },
+})
+
+require("nvim-treesitter").setup({})
+require("nvim-treesitter").install({
+  "bash",
+  "blade",
+  "c",
+  "comment",
+  "css",
+  "diff",
+  "dockerfile",
+  "fish",
+  "gitcommit",
+  "gitignore",
+  "go",
+  "gomod",
+  "gosum",
+  "gowork",
+  "html",
+  "ini",
+  "javascript",
+  "jsdoc",
+  "json",
+  "lua",
+  "luadoc",
+  "luap",
+  "make",
+  "markdown",
+  "markdown_inline",
+  "nginx",
+  "nix",
+  "proto",
+  "python",
+  "query",
+  "regex",
+  "rust",
+  "scss",
+  "sql",
+  "terraform",
+  "toml",
+  "tsx",
+  "typescript",
+  "vim",
+  "vimdoc",
+  "xml",
+  "yaml",
+  "zig",
+})
+
+require("nvim-treesitter-textobjects").setup({
+  select = {
+    enable = true,
+    lookahead = true,
+    selection_modes = {
+      ["@parameter.outer"] = "v", -- charwise
+      ["@function.outer"] = "V", -- linewise
+      ["@class.outer"] = "<c-v>", -- blockwise
+    },
+    include_surrounding_whitespace = false,
+  },
+  move = {
+    enable = true,
+    set_jumps = true,
+  },
+})
+
+-- SELECT keymaps
+local sel = require("nvim-treesitter-textobjects.select")
+for _, map in ipairs({
+  { { "x", "o" }, "af", "@function.outer" },
+  { { "x", "o" }, "if", "@function.inner" },
+  { { "x", "o" }, "ac", "@class.outer" },
+  { { "x", "o" }, "ic", "@class.inner" },
+  { { "x", "o" }, "aa", "@parameter.outer" },
+  { { "x", "o" }, "ia", "@parameter.inner" },
+  { { "x", "o" }, "ad", "@comment.outer" },
+  { { "x", "o" }, "as", "@statement.outer" },
+}) do
+vim.keymap.set(map[1], map[2], function()
+  sel.select_textobject(map[3], "textobjects")
+end, { desc = "Select " .. map[3] })
+end
+
+-- MOVE keymaps
+local mv = require("nvim-treesitter-textobjects.move")
+for _, map in ipairs({
+  { { "n", "x", "o" }, "]m", mv.goto_next_start, "@function.outer" },
+  { { "n", "x", "o" }, "[m", mv.goto_previous_start, "@function.outer" },
+  { { "n", "x", "o" }, "]]", mv.goto_next_start, "@class.outer" },
+  { { "n", "x", "o" }, "[[", mv.goto_previous_start, "@class.outer" },
+  { { "n", "x", "o" }, "]M", mv.goto_next_end, "@function.outer" },
+  { { "n", "x", "o" }, "[M", mv.goto_previous_end, "@function.outer" },
+  { { "n", "x", "o" }, "]o", mv.goto_next_start, { "@loop.inner", "@loop.outer" } },
+  { { "n", "x", "o" }, "[o", mv.goto_previous_start, { "@loop.inner", "@loop.outer" } },
+}) do
+local modes, lhs, fn, query = map[1], map[2], map[3], map[4]
+-- build a human-readable desc
+local qstr = (type(query) == "table") and table.concat(query, ",") or query
+vim.keymap.set(modes, lhs, function()
+  fn(query, "textobjects")
+end, { desc = "Move to " .. qstr })
+end
+
+vim.api.nvim_create_autocmd("PackChanged", {
+  desc = "Handle nvim-treesitter updates",
+  group = vim.api.nvim_create_augroup("nvim-treesitter-pack-changed-update-handler", { clear = true }),
+  callback = function(event)
+    if event.data.kind == "update" then
+      local ok = pcall(vim.cmd, "TSUpdate")
+      if ok then
+        vim.notify("TSUpdate completed successfully!", vim.log.levels.INFO)
+      else
+        vim.notify("TSUpdate command not available yet, skipping", vim.log.levels.WARN)
+      end
+    end
+  end,
+})
+
+vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "*" },
+  callback = function()
+    local filetype = vim.bo.filetype
+    if filetype and filetype ~= "" then
+      local success = pcall(function()
+        vim.treesitter.start()
+      end)
+      if not success then
+        return
+      end
+    end
+  end,
+})