fix: cleanup unnecessary treesitter langs and mason lsp servers

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

@@ -5,14 +5,6 @@ return {
       root = { "ansible.cfg", ".ansible-lint" },
     })
   end,
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "yaml" })
-      end
-    end,
-  },
   {
     "williamboman/mason.nvim",
     opts = function(_, opts)

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

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

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

@@ -15,14 +15,6 @@ return {
       })
     end,
   },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "elixir-ls",
-      })
-    end,
-  },
   {
     "nvim-neotest/neotest",
     optional = true,

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

@@ -26,12 +26,4 @@ return {
       },
     },
   },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "helm-ls",
-      })
-    end,
-  },
 }

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

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

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

@@ -15,19 +15,11 @@ return {
       },
     },
   },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "markdown", "markdown_inline" })
-      end
-    end,
-  },
   {
     "williamboman/mason.nvim",
     opts = function(_, opts)
       opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "markdownlint", "marksman" })
+      vim.list_extend(opts.ensure_installed, { "markdownlint" })
     end,
   },
   {

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

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

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

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

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

@@ -13,14 +13,6 @@ return {
       })
     end,
   },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "solargraph",
-      })
-    end,
-  },
   {
     "neovim/nvim-lspconfig",
     opts = {

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

@@ -32,7 +32,7 @@ return {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)
       opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "ron", "rust", "toml" })
+      vim.list_extend(opts.ensure_installed, { "ron", "rust" })
     end,
   },
 

lua/lazyvim/plugins/extras/lang/tex.lua

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

lua/lazyvim/plugins/extras/lang/toml.lua

@@ -5,27 +5,10 @@ return {
       root = "*.toml",
     })
   end,
-  {
+  "neovim/nvim-lspconfig",
-    "nvim-treesitter/nvim-treesitter",
+  opts = {
-    opts = function(_, opts)
+    servers = {
-      if type(opts.ensure_installed) == "table" then
+      taplo = {},
-        vim.list_extend(opts.ensure_installed, { "toml" })
-      end
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "taplo" })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        taplo = {},
-      },
     },
   },
 }

lua/lazyvim/plugins/extras/lang/yaml.lua

@@ -5,16 +5,6 @@ return {
     })
   end,
 
-  -- add yaml specific modules to treesitter
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "yaml" })
-      end
-    end,
-  },
-
   -- yaml schema support
   {
     "b0o/SchemaStore.nvim",

tests/extras/lang_spec.lua

@@ -19,7 +19,8 @@ describe("Extra", function()
       return name:match("%.lua$")
     end, { limit = math.huge, type = "file", path = "lua/lazyvim/plugins/extras" })
   )
-  local servers = require("mason-lspconfig.mappings.server").package_to_lspconfig
+  local lsp_to_pkg = require("mason-lspconfig.mappings.server").lspconfig_to_package
+  local pkg_to_lsp = require("mason-lspconfig.mappings.server").package_to_lspconfig
 
   local tsspec = Plugin.Spec.new({
     import = "lazyvim.plugins.treesitter",
@@ -43,16 +44,27 @@ describe("Extra", function()
 
       if extra.modname:find("%.lang%.") then
         assert(mod.recommended, "`recommended` not set for " .. extra.modname)
-        local mason = spec.plugins["mason.nvim"]
+        local lspconfig = spec.plugins["nvim-lspconfig"]
-        local opts = Plugin.values(mason, "opts", false)
+
-        for _, v in ipairs(opts.ensure_installed) do
+        if lspconfig then
-          assert(
+          local lspconfig_opts = Plugin.values(lspconfig, "opts", false)
-            not servers[v],
+          local mason = spec.plugins["mason.nvim"]
-            "LSP server " .. v .. " is installed automatically. Please remove from the mason.nvim spec"
+          local mason_opts = Plugin.values(mason, "opts", false)
-          )
+
+          for lsp in pairs(lspconfig_opts.servers or {}) do
+            local lsp_pkg = pkg_to_lsp[lsp]
+            assert(
+              not (lsp_pkg and vim.tbl_contains(mason_opts.ensure_installed, lsp_pkg)),
+              "LSP server "
+                .. lsp
+                .. " with pkg "
+                .. (lsp_pkg or "foo")
+                .. " is installed automatically. Please remove from the mason.nvim spec"
+            )
+          end
         end
         local ts = spec.plugins["nvim-treesitter"]
-        opts = Plugin.values(mason, "opts", false)
+        local opts = Plugin.values(ts, "opts", false)
         for _, v in ipairs(opts.ensure_installed) do
           assert(
             not vim.tbl_contains(tsensure, v),