Adopt new treesitter in nvim

Author: ddeville

config/common/.config/nvim/lazy-lock.json

@@ -16,8 +16,7 @@
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
   "nvim-lightbulb": { "branch": "master", "commit": "e974b1a93c917c840545f51b9a66cfd72c520522" },
   "nvim-lspconfig": { "branch": "master", "commit": "a776085e04f7b15d0b59fae2244df07d98360ab4" },
-  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },

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

@@ -1,70 +1,87 @@
+local ensure_installed = {
+  'awk',
+  'bash',
+  'c',
+  'cmake',
+  'comment',
+  'cpp',
+  'css',
+  'diff',
+  'dockerfile',
+  'fish',
+  'git_config',
+  'git_rebase',
+  'gitattributes',
+  'gitignore',
+  'go',
+  'gomod',
+  'gosum',
+  'gowork',
+  'hcl',
+  'html',
+  'java',
+  'javascript',
+  'json',
+  'jq',
+  'kotlin',
+  'lua',
+  'luadoc',
+  'make',
+  'markdown',
+  'ninja',
+  'objc',
+  'proto',
+  'python',
+  'regex',
+  'ruby',
+  'rust',
+  'sql',
+  'starlark',
+  'sxhkdrc',
+  'terraform',
+  'toml',
+  'typescript',
+  'vim',
+  'vimdoc',
+  'yaml',
+}
+
+local install_dir = vim.fn.stdpath('data') .. '/site'
+
+local function setup_treesitter()
+  local treesitter = require('nvim-treesitter')
+  treesitter.setup({
+    install_dir = install_dir,
+  })
+
+  treesitter.install(ensure_installed)
+
+  -- Use existing parsers for custom filetypes.
+  vim.treesitter.language.register('starlark', { 'tiltfile' })
+  vim.treesitter.language.register('ruby', { 'brewfile' })
+
+  vim.api.nvim_create_autocmd('FileType', {
+    group = vim.api.nvim_create_augroup('TreesitterHighlight', { clear = true }),
+    callback = function(args)
+      pcall(vim.treesitter.start, args.buf)
+    end,
+  })
+end
+
+local function update_treesitter()
+  local treesitter = require('nvim-treesitter')
+  treesitter.setup({
+    install_dir = install_dir,
+  })
+  treesitter.install(ensure_installed):wait(300000)
+end
+
 return {
   {
     'nvim-treesitter/nvim-treesitter',
-    config = function()
-      require('nvim-treesitter.configs').setup({
-        ensure_installed = {
-          'awk',
-          'bash',
-          'c',
-          'cmake',
-          'comment',
-          'cpp',
-          'css',
-          'diff',
-          'dockerfile',
-          'fish',
-          'git_config',
-          'git_rebase',
-          'gitattributes',
-          'gitignore',
-          'go',
-          'gomod',
-          'gosum',
-          'gowork',
-          'hcl',
-          'html',
-          'java',
-          'javascript',
-          'json',
-          'jq',
-          'kotlin',
-          'lua',
-          'luadoc',
-          'make',
-          'markdown',
-          'ninja',
-          'objc',
-          'proto',
-          'python',
-          'regex',
-          'ruby',
-          'rust',
-          'sql',
-          'starlark',
-          'sxhkdrc',
-          'terraform',
-          'toml',
-          'typescript',
-          'vim',
-          'vimdoc',
-          'yaml',
-        },
-        highlight = {
-          enable = true,
-          additional_vim_regex_highlighting = false,
-        },
-      })
-
-      -- Use the starlark config for custom filetype
-      vim.treesitter.language.register('starlark', { 'tiltfile' })
-      vim.treesitter.language.register('ruby', { 'brewfile' })
-    end,
-    build = function()
-      pcall(require('nvim-treesitter.install').update({ with_sync = true }))
-    end,
-    dependencies = {
-      'nvim-treesitter/nvim-treesitter-textobjects',
-    },
+    branch = 'main',
+    lazy = false,
+    config = setup_treesitter,
+    build = update_treesitter,
   },
 }