updates

lua/plugins/treesitter.lua

@@ -3,20 +3,18 @@ return {
     {
         'nvim-treesitter/nvim-treesitter',
         build = ':TSUpdate',
-        event = 'FileType',
+        event = 'VeryLazy',
         cmd = { 'TSInstall', 'TSBufEnable', 'TSBufDisable', 'TSModuleInfo' },
         dependencies = {
             'nvim-treesitter/nvim-treesitter-textobjects',
-            { 'windwp/nvim-ts-autotag', event = { 'BufReadPost', 'BufNewFile', 'BufWritePre' } },
+            { 'windwp/nvim-ts-autotag', ft = { 'html', 'xml', 'tsx' }, opts = {} },
         },
         config = function()
             require('nvim-ts-autotag').setup()
             require('nvim-treesitter.configs').setup({
-                highlight = {
-                    enable = true,
-                },
                 indent = {
                     enable = true,
+                    disable = { 'ruby' },
                 },
                 ensure_installed = {
                     'vim',
@@ -25,21 +23,58 @@ return {
                     'markdown_inline',
                     'bash',
                     'c',
-                    'cpp',
                     'java',
                     'javascript',
                     'typescript',
                     'tsx',
                     'json',
-                    'toml',
                     'html',
                     'css',
                     'scss',
                     'lua',
+                    'luadoc',
+                    'diff',
+                    'gitcommit',
                     'python',
                     'liquid',
                 },
                 auto_install = true,
+                highlight = {
+                    enable = true,
+                    disable = function(_, buf)
+                        local line_count = vim.api.nvim_buf_line_count(buf)
+                        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+
+                        -- vim.notify('stats: ' .. vim.inspect(stats))
+
+                        -- if file is at least 10k and the average bytes per line is > 250, then disable treesitter
+                        if ok and stats and (stats.size > (10 * 1024)) and (stats.size / line_count) > 250 then
+                            vim.notify(
+                                'Disabling treesitter, bytes: '
+                                    .. stats.size
+                                    .. ', lines: '
+                                    .. line_count
+                                    .. ', bytes / lines: '
+                                    .. math.floor(stats.size / line_count)
+                            )
+                            return true
+                        end
+                        return false
+                    end,
+                    -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
+                    --  If you are experiencing weird indenting issues, add the language to
+                    --  the list of additional_vim_regex_highlighting and disabled languages for indent.
+                    additional_vim_regex_highlighting = { 'ruby' },
+                },
+                incremental_selection = {
+                    enable = true,
+                    keymaps = {
+                        init_selection = '<C-space>',
+                        node_incremental = '<C-space>',
+                        scope_incremental = false,
+                        node_decremental = '<bs>',
+                    },
+                },
                 playground = {
                     enable = true,
                     disable = {},
@@ -55,6 +90,19 @@ return {
                             ['ic'] = { query = '@class.inner', desc = 'Select inner part of a class region' },
                         },
                     },
+                    move = {
+                        enable = true,
+                        -- don't include classes to not conflict with conflicts in a diff
+                        -- (LazyVim has some clever code but i don't think we need it right now)
+                        -- goto_next_start = { [']f'] = '@function.outer', [']c'] = '@class.outer', [']a'] = '@parameter.inner' },
+                        -- goto_next_end = { [']F'] = '@function.outer', [']C'] = '@class.outer', [']A'] = '@parameter.inner' },
+                        -- goto_previous_start = { ['[f'] = '@function.outer', ['[c'] = '@class.outer', ['[a'] = '@parameter.inner' },
+                        -- goto_previous_end = { ['[F'] = '@function.outer', ['[C'] = '@class.outer', ['[A'] = '@parameter.inner' },
+                        goto_next_start = { [']f'] = '@function.outer', [']a'] = '@parameter.inner' },
+                        goto_next_end = { [']F'] = '@function.outer', [']A'] = '@parameter.inner' },
+                        goto_previous_start = { ['[f'] = '@function.outer', ['[a'] = '@parameter.inner' },
+                        goto_previous_end = { ['[F'] = '@function.outer', ['[A'] = '@parameter.inner' },
+                    },
                     swap = {
                         enable = true,
                         swap_next = {