Upgrade to v0.12.x, remove nvim-treesitter

Switch to tree-sitter-manager.nvim for managing tree-sitter parsers and
queries. Also fixes upgrade issues.

after/indent/python.lua

@@ -1,2 +0,0 @@
--- Use treesitter for Python indenting since regex indenting is broken
-vim.opt.indentexpr = 'nvim_treesitter#indent()'

lua/plugins/mdx.lua

@@ -1,6 +0,0 @@
-return {
-  'davidmh/mdx.nvim',
-  dependencies = {
-    'nvim-treesitter/nvim-treesitter',
-  },
-}

lua/plugins/treesitter.lua

@@ -1,23 +1,11 @@
 return {
-  'nvim-treesitter/nvim-treesitter',
+  {
-  branch = 'master',
+    'romus204/tree-sitter-manager.nvim',
-  dependencies = {
+    lazy = false,
-    'nvim-treesitter/nvim-treesitter-textobjects',
-    { 'nvim-treesitter/nvim-treesitter-context', opts = {} },
-    -- TODO: Fork this and add CMake support
-    -- TODO: Add shell support (sh/bash/zsh if/for/while/etc)
-    'RRethy/nvim-treesitter-endwise',
-    'danymat/neogen',
-  },
-  build = ':TSUpdate',
     config = function()
-    require('nvim-treesitter').setup()
+      require('tree-sitter-manager').setup({
-    require('nvim-treesitter.configs').setup({
+        -- Enable core highlighting for every installed parser.
-      sync_install = false,
+        highlight = true,
-      highlight = { enable = true },
-      indent = { enable = false },
-
-      -- List of languages that must be available
         ensure_installed = {
           'asm',
           'bash',
@@ -52,6 +40,7 @@ return {
           'markdown',
           'markdown_inline',
           'meson',
+          'mlir',
           'ninja',
           'objc',
           'objdump',
@@ -72,36 +61,48 @@ return {
           'xml',
           'yaml',
         },
+      })
+    end,
+  },
 
-      -- After opening statements insert end statements
+  {
-      endwise = { enable = true },
+    'nvim-treesitter/nvim-treesitter-textobjects',
-
+    branch = 'main',
-      -- Text objects using Tree-sitter groups
+    config = function()
-      textobjects = {
+      require('nvim-treesitter-textobjects').setup({
         select = {
-          enable = true,
           lookahead = true,
-          -- include_surrounding_whitespace = true,
-          keymaps = {
-            -- Class text objects
-            ['ac'] = '@class.outer',
-            ['ic'] = '@class.inner',
-            -- Function text objects
-            ['af'] = '@function.outer',
-            ['if'] = '@function.inner',
-            -- Parameter/argument text objects
-            ['a,'] = '@parameter.outer',
-            ['i,'] = '@parameter.inner',
-            -- Comment text objects
-            ['a/'] = '@comment.outer',
-            ['i/'] = '@comment.inner',
-          },
-        },
         },
       })
 
+      local select = require('nvim-treesitter-textobjects.select')
+      local function map(lhs, query)
+        vim.keymap.set({ 'x', 'o' }, lhs, function()
+          select.select_textobject(query, 'textobjects')
+        end, { desc = 'Select ' .. query })
+      end
+
+      map('ac', '@class.outer')     -- Class text objects
+      map('ic', '@class.inner')
+      map('af', '@function.outer')  -- Function text objects
+      map('if', '@function.inner')
+      map('a,', '@parameter.outer') -- Parameter/argument text objects
+      map('i,', '@parameter.inner')
+      map('a/', '@comment.outer')   -- Comment text objects
+      map('i/', '@comment.inner')
+    end,
+  },
+
+  { 'nvim-treesitter/nvim-treesitter-context', opts = {} },
+
+  {
+    'danymat/neogen',
+    config = function()
       require('neogen').setup({ snippet_engine = 'luasnip' })
       vim.keymap.set('n', '<leader>d', require('neogen').generate,
         { desc = 'Generate documentation' })
-  end
+    end,
+  },
+
+  'davidmh/mdx.nvim',
 }

plugin/mappings.lua

@@ -59,7 +59,7 @@ vim.keymap.set('n', '<leader>gw', function()
 end, { desc = 'Format whole file with gw' })
 
 vim.keymap.set('n', '<leader>fm', function()
-  if vim.o.foldexpr == 'nvim_treesitter#foldexpr()' then
+  if vim.o.foldexpr == 'v:lua.vim.treesitter.foldexpr()' then
-    vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
+    vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
   end
 end)

plugin/settings.lua

@@ -89,7 +89,7 @@ vim.opt.joinspaces = false
 -- Set fold level to something high
 vim.opt.foldlevel = 20
 vim.opt.foldmethod = 'expr'
-vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
+vim.opt.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 vim.opt.foldtext = ''
 vim.opt.fillchars = { fold = ' ' }
 

plugin/ui.lua

@@ -1,17 +1,3 @@
--- Customise LSP UI
-vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
-  vim.lsp.handlers.hover, {
-    border = 'rounded',
-    title = 'Hover',
-  }
-)
-vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
-  vim.lsp.handlers.signature_help, {
-    border = 'rounded',
-    title = 'Signature Help',
-  }
-)
-
 -- Customise diagnostic UI
 vim.diagnostic.config({
   float = {