refactor: use lazy's new opts_extend functionality for treesitter and mason

lua/lazyvim/plugins/extras/lang/ansible.lua

@@ -7,11 +7,7 @@ return {
   end,
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "ansible-lint" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      -- for ansiblels validation
-      vim.list_extend(opts.ensure_installed, { "ansible-lint" })
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/astro.lua

@@ -15,11 +15,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "astro" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "astro" })
-      end
-    end,
   },
 
   -- LSP Servers

lua/lazyvim/plugins/extras/lang/clangd.lua

@@ -16,11 +16,7 @@ return {
   -- Add C/C++ to treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "cpp" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "cpp" })
-      end
-    end,
   },
 
   {
@@ -120,11 +116,7 @@ return {
       -- Ensure C/C++ debugger is installed
       "williamboman/mason.nvim",
       optional = true,
-      opts = function(_, opts)
+      opts = { ensure_installed = { "codelldb" } },
-        if type(opts.ensure_installed) == "table" then
-          vim.list_extend(opts.ensure_installed, { "codelldb" })
-        end
-      end,
     },
     opts = function()
       local dap = require("dap")

lua/lazyvim/plugins/extras/lang/cmake.lua

@@ -7,11 +7,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "cmake" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "cmake" })
-      end
-    end,
   },
   {
     "nvimtools/none-ls.nvim",
@@ -34,10 +30,7 @@ return {
   },
   {
     "mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "cmakelang", "cmakelint" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "cmakelang", "cmakelint" })
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/docker.lua

@@ -7,18 +7,11 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "dockerfile" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "dockerfile" })
-      end
-    end,
   },
   {
     "mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "hadolint" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "hadolint" })
-    end,
   },
   {
     "nvimtools/none-ls.nvim",

lua/lazyvim/plugins/extras/lang/elixir.lua

@@ -7,13 +7,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "elixir", "heex", "eex" } },
-      vim.list_extend(opts.ensure_installed, {
-        "elixir",
-        "heex",
-        "eex",
-      })
-    end,
   },
   {
     "nvim-neotest/neotest",

lua/lazyvim/plugins/extras/lang/elm.lua

@@ -6,19 +6,12 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "elm" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "elm" })
-      end
-    end,
   },
 
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "elm-format" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "elm-format" })
-    end,
   },
 
   {

lua/lazyvim/plugins/extras/lang/git.lua

@@ -5,19 +5,13 @@ return {
   -- Treesitter git support
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "git_config", "gitcommit", "git_rebase", "gitignore", "gitattributes" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "git_config", "gitcommit", "git_rebase", "gitignore", "gitattributes" })
-    end,
   },
 
   {
     "nvim-cmp",
     dependencies = {
-      {
+      { "petertriho/cmp-git", opts = {} },
-        "petertriho/cmp-git",
-        opts = {},
-      },
     },
     ---@module 'cmp'
     ---@param opts cmp.ConfigSchema

lua/lazyvim/plugins/extras/lang/gleam.lua

@@ -6,11 +6,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "gleam" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "gleam" })
-      end
-    end,
   },
 
   {

lua/lazyvim/plugins/extras/lang/go.lua

@@ -7,14 +7,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "go", "gomod", "gowork", "gosum" } },
-      vim.list_extend(opts.ensure_installed, {
-        "go",
-        "gomod",
-        "gowork",
-        "gosum",
-      })
-    end,
   },
   {
     "neovim/nvim-lspconfig",
@@ -90,10 +83,7 @@ return {
   -- Ensure Go tools are installed
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "goimports", "gofumpt" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "goimports", "gofumpt" })
-    end,
   },
   {
     "nvimtools/none-ls.nvim",
@@ -101,10 +91,7 @@ return {
     dependencies = {
       {
         "williamboman/mason.nvim",
-        opts = function(_, opts)
+        opts = { ensure_installed = { "gomodifytags", "impl" } },
-          opts.ensure_installed = opts.ensure_installed or {}
-          vim.list_extend(opts.ensure_installed, { "gomodifytags", "impl" })
-        end,
       },
     },
     opts = function(_, opts)
@@ -132,10 +119,7 @@ return {
     dependencies = {
       {
         "williamboman/mason.nvim",
-        opts = function(_, opts)
+        opts = { ensure_installed = { "delve" } },
-          opts.ensure_installed = opts.ensure_installed or {}
-          vim.list_extend(opts.ensure_installed, { "delve" })
-        end,
       },
       {
         "leoluz/nvim-dap-go",

lua/lazyvim/plugins/extras/lang/haskell.lua

@@ -9,11 +9,7 @@ return {
   -- Add Haskell to treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "haskell" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "haskell" })
-      end
-    end,
   },
 
   {
@@ -33,10 +29,7 @@ return {
 
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "haskell-language-server" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "haskell-language-server" })
-    end,
   },
 
   {
@@ -45,10 +38,7 @@ return {
     dependencies = {
       {
         "williamboman/mason.nvim",
-        opts = function(_, opts)
+        opts = { ensure_installed = { "haskell-debug-adapter" } },
-          opts.ensure_installed = opts.ensure_installed or {}
-          vim.list_extend(opts.ensure_installed, { "haskell-debug-adapter" })
-        end,
       },
     },
   },

lua/lazyvim/plugins/extras/lang/helm.lua

@@ -16,7 +16,11 @@ return {
     })
   end,
 
-  { "towolf/vim-helm", ft = "helm" },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = { ensure_installed = { "helm" } },
+  },
+
   {
     "neovim/nvim-lspconfig",
     opts = {

lua/lazyvim/plugins/extras/lang/java.lua

@@ -33,10 +33,7 @@ return {
   -- Add java to treesitter.
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "java" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "java" })
-    end,
   },
 
   -- Ensure java debugger and test packages are installed.
@@ -46,10 +43,7 @@ return {
     dependencies = {
       {
         "williamboman/mason.nvim",
-        opts = function(_, opts)
+        opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
-          opts.ensure_installed = opts.ensure_installed or {}
-          vim.list_extend(opts.ensure_installed, { "java-test", "java-debug-adapter" })
-        end,
       },
     },
   },

lua/lazyvim/plugins/extras/lang/json.lua

@@ -9,11 +9,7 @@ return {
   -- add json to treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "json5" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "json5" })
-      end
-    end,
   },
 
   -- yaml schema support

lua/lazyvim/plugins/extras/lang/kotlin.lua

@@ -15,16 +15,12 @@ return {
   -- Add packages(linting, debug adapter)
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "ktlint" } },
-      vim.list_extend(opts.ensure_installed or {}, { "ktlint" })
-    end,
   },
   -- Add syntax highlighting
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "kotlin" } },
-      vim.list_extend(opts.ensure_installed or {}, { "kotlin" })
-    end,
   },
   -- Add language server
   {

lua/lazyvim/plugins/extras/lang/markdown.lua

@@ -17,10 +17,7 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "markdownlint", "markdown-toc" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "markdownlint", "markdown-toc" })
-    end,
   },
   {
     "nvimtools/none-ls.nvim",

lua/lazyvim/plugins/extras/lang/nix.lua

@@ -5,10 +5,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "nix" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "nix" })
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/omnisharp.lua

@@ -9,11 +9,7 @@ return {
   { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "c_sharp" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "c_sharp" })
-      end
-    end,
   },
   {
     "nvimtools/none-ls.nvim",
@@ -41,11 +37,7 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "csharpier", "netcoredbg" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "netcoredbg", "csharpier" })
-      end
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/php.lua

@@ -6,9 +6,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "php" } },
-      vim.list_extend(opts.ensure_installed, { "php" })
-    end,
   },
 
   {
@@ -25,11 +23,7 @@ return {
     optional = true,
     dependencies = {
       "williamboman/mason.nvim",
-      opts = function(_, opts)
+      opts = { ensure_installed = { "php-debug-adapter" } },
-        if type(opts.ensure_installed) == "table" then
-          table.insert(opts.ensure_installed, "php-debug-adapter")
-        end
-      end,
     },
     opts = function()
       local dap = require("dap")

lua/lazyvim/plugins/extras/lang/python.lua

@@ -24,11 +24,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "ninja", "rst" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "ninja", "rst" })
-      end
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/r.lua

@@ -59,11 +59,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "r", "rnoweb" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "r", "rnoweb" })
-      end
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/ruby.lua

@@ -7,11 +7,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "ruby" } },
-      vim.list_extend(opts.ensure_installed, {
-        "ruby",
-      })
-    end,
   },
   {
     "neovim/nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/rust.lua

@@ -30,20 +30,14 @@ return {
   -- Add Rust & related to treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "rust", "ron" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "ron", "rust" })
-    end,
   },
 
   -- Ensure Rust debugger is installed
   {
     "williamboman/mason.nvim",
     optional = true,
-    opts = function(_, opts)
+    opts = { ensure_installed = { "codelldb" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "codelldb" })
-    end,
   },
 
   {

lua/lazyvim/plugins/extras/lang/scala.lua

@@ -7,11 +7,7 @@ return {
   end,
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "scala" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "scala" })
-      end
-    end,
   },
   {
     "scalameta/nvim-metals",

lua/lazyvim/plugins/extras/lang/sql.lua

@@ -67,11 +67,7 @@ return {
   {
     "nvim-treesitter/nvim-treesitter",
     optional = true,
-    opts = function(_, opts)
+    opts = { ensure_installed = { "sql" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "sql" })
-      end
-    end,
   },
 
   -- Edgy integration
@@ -99,10 +95,7 @@ return {
   -- Linters & formatters
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "sqlfluff" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "sqlfluff" })
-    end,
   },
   {
     "mfussenegger/nvim-lint",

lua/lazyvim/plugins/extras/lang/svelte.lua

@@ -15,11 +15,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "svelte" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "svelte" })
-      end
-    end,
   },
 
   -- LSP Servers

lua/lazyvim/plugins/extras/lang/terraform.lua

@@ -8,14 +8,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "terraform", "hcl" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, {
-          "terraform",
-          "hcl",
-        })
-      end
-    end,
   },
   {
     "neovim/nvim-lspconfig",
@@ -28,10 +21,7 @@ return {
   -- ensure terraform tools are installed
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "tflint" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "tflint" })
-    end,
   },
   {
     "nvimtools/none-ls.nvim",

lua/lazyvim/plugins/extras/lang/thrift.lua

@@ -5,11 +5,7 @@ return {
   },
   {
     "nvim-treesitter",
-    optional = true,
+    opts = { ensure_installed = { "thrift" } },
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "thrift" })
-    end,
   },
   {
     "nvim-lspconfig",

lua/lazyvim/plugins/extras/lang/vue.lua

@@ -11,11 +11,7 @@ return {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "vue" } },
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "vue" })
-      end
-    end,
   },
 
   -- Add LSP servers

lua/lazyvim/plugins/extras/util/dot.lua

@@ -19,10 +19,7 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = { ensure_installed = { "shellcheck" } },
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "shellcheck" })
-    end,
   },
   -- add some stuff to treesitter
   {

lua/lazyvim/plugins/extras/util/gitui.lua

@@ -3,6 +3,7 @@ return {
   -- Ensure GitUI tool is installed
   {
     "williamboman/mason.nvim",
+    opts = { ensure_installed = { "gitui" } },
     keys = {
       {
         "<leader>gG",
@@ -30,9 +31,5 @@ return {
         end,
       })
     end,
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "gitui" })
-    end,
   },
 }

lua/lazyvim/plugins/lsp/init.lua

@@ -261,11 +261,11 @@ return {
     cmd = "Mason",
     keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
     build = ":MasonUpdate",
+    opts_extend = { "ensure_installed" },
     opts = {
       ensure_installed = {
         "stylua",
         "shfmt",
-        -- "flake8",
       },
     },
     ---@param opts MasonSettings | {ensure_installed: string[]}

lua/lazyvim/plugins/treesitter.lua

@@ -22,6 +22,7 @@ return {
       { "<c-space>", desc = "Increment Selection" },
       { "<bs>", desc = "Decrement Selection", mode = "x" },
     },
+    opts_extend = { "ensure_installed" },
     ---@type TSConfig
     ---@diagnostic disable-next-line: missing-fields
     opts = {