Merge branch 'AstroNvim:main' into main

Author: ozoromo

lua/lazy_snapshot.lua

@@ -7,7 +7,7 @@ return {
   { "NvChad/nvim-colorizer.lua", commit = "dde3084106a70b9a79d48f426f6d6fec6fd203f7", optional = true },
   { "Shatur/neovim-session-manager", commit = "68dde355a4304d83b40cf073f53915604bdd8e70", optional = true },
   { "akinsho/toggleterm.nvim", version = "^2", optional = true },
-  { "b0o/SchemaStore.nvim", commit = "686687585c040529f7efa68aa433282068c9d78b", optional = true },
+  { "b0o/SchemaStore.nvim", commit = "f934fbbf417cf05da7f1576c67655ab25f7b702d", optional = true },
   { "echasnovski/mini.bufremove", commit = "f53c7f27e36009fe61563c11cde154b94a0e5b94", optional = true },
   { "folke/lazy.nvim", version = "^10", optional = true },
   { "folke/neoconf.nvim", version = "^1", optional = true },
@@ -17,7 +17,7 @@ return {
   { "hrsh7th/cmp-buffer", commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa", optional = true },
   { "hrsh7th/cmp-nvim-lsp", commit = "44b16d11215dce86f253ce0c30949813c0a90765", optional = true },
   { "hrsh7th/cmp-path", commit = "91ff86cd9c29299a64f968ebb45846c485725f23", optional = true },
-  { "hrsh7th/nvim-cmp", commit = "51260c02a8ffded8e16162dcf41a23ec90cfba62", optional = true },
+  { "hrsh7th/nvim-cmp", commit = "0b751f6beef40fd47375eaf53d3057e0bfa317e4", optional = true },
   { "jay-babu/mason-null-ls.nvim", version = "^2", optional = true },
   { "jay-babu/mason-nvim-dap.nvim", version = "^2", optional = true },
   { "jose-elias-alvarez/null-ls.nvim", commit = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7", optional = true },
@@ -28,15 +28,15 @@ return {
   { "max397574/better-escape.nvim", commit = "7031dc734add47bb71c010e0551829fa5799375f", optional = true },
   { "mfussenegger/nvim-dap", version = "^0.6", optional = true },
   { "mrjones2014/smart-splits.nvim", version = "^1", optional = true },
-  { "neovim/nvim-lspconfig", commit = "d0467b9574b48429debf83f8248d8cee79562586", optional = true },
+  { "neovim/nvim-lspconfig", commit = "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df", optional = true },
   { "numToStr/Comment.nvim", version = "^0.8", optional = true },
   { "nvim-lua/plenary.nvim", version = "^0.1", optional = true },
   { "nvim-neo-tree/neo-tree.nvim", version = "^3", optional = true },
   { "nvim-telescope/telescope-fzf-native.nvim", commit = "6c921ca12321edaa773e324ef64ea301a1d0da62", optional = true },
   { "nvim-telescope/telescope.nvim", version = "^0.1", optional = true },
-  { "nvim-tree/nvim-web-devicons", commit = "5de460ca7595806044eced31e3c36c159a493857", optional = true },
-  { "nvim-treesitter/nvim-treesitter", commit = "c5a7533113b2deb7db899d387b877389cc8b6113", optional = true },
-  { "nvim-treesitter/nvim-treesitter-textobjects", commit = "e69a504baf2951d52e1f1fbb05145d43f236cbf1", optional = true },
+  { "nvim-tree/nvim-web-devicons", commit = "47103b80c38c59f7a1b5408c232b92bf5d018651", optional = true },
+  { "nvim-treesitter/nvim-treesitter", commit = "8996612bfbebe1657e1bb55a95201c96cab945c6", optional = true },
+  { "nvim-treesitter/nvim-treesitter-textobjects", commit = "e1e670a86274d5cb681e475d4891ea1afe605ced", optional = true },
   { "onsails/lspkind.nvim", commit = "57610d5ab560c073c465d6faf0c19f200cb67e6e", optional = true },
   { "rafamadriz/friendly-snippets", commit = "43727c2ff84240e55d4069ec3e6158d74cb534b6", optional = true },
   { "rcarriga/cmp-dap", commit = "d16f14a210cd28988b97ca8339d504533b7e09a4", optional = true },

lua/plugins/configs/nvim-treesitter.lua

@@ -1 +1,11 @@
-return function(_, opts) require("nvim-treesitter.configs").setup(opts) end
+return function(_, opts)
+  if type(opts.ensure_installed) == "table" then
+    local added = {}
+    opts.ensure_installed = vim.tbl_filter(function(parser)
+      if added[parser] then return false end
+      added[parser] = true
+      return true
+    end, opts.ensure_installed)
+  end
+  require("nvim-treesitter.configs").setup(opts)
+end

lua/plugins/treesitter.lua

@@ -23,10 +23,32 @@ return {
     "TSUpdateSync",
   },
   build = ":TSUpdate",
+  init = function(plugin)
+    -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early
+    -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which
+    -- no longer trigger the **nvim-treeitter** module to be loaded in time.
+    -- Luckily, the only thins that those plugins need are the custom queries, which we make available
+    -- during startup.
+    -- CODE FROM LazyVim (thanks folke!) https://github.com/LazyVim/LazyVim/commit/1e1b68d633d4bd4faa912ba5f49ab6b8601dc0c9
+    require("lazy.core.loader").add_to_rtp(plugin)
+    require "nvim-treesitter.query_predicates"
+  end,
   opts = function()
     return {
       autotag = { enable = true },
       context_commentstring = { enable = true, enable_autocmd = false },
+      -- HACK: force install of shipped neovim parsers since TSUpdate doesn't correctly update them
+      ensure_installed = {
+        "bash",
+        "c",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "vim",
+        "vimdoc",
+      },
       highlight = {
         enable = true,
         disable = function(_, bufnr) return vim.b[bufnr].large_buf end,