aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md3
-rw-r--r--doc/mason-lspconfig-mapping.txt1
-rw-r--r--doc/server-mapping.md1
-rw-r--r--lua/mason-lspconfig/mappings/filetype.lua2
-rw-r--r--lua/mason-lspconfig/mappings/server.lua1
5 files changed, 6 insertions, 2 deletions
diff --git a/README.md b/README.md
index f8ef21c..346c1af 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,8 @@ local DEFAULT_SETTINGS = {
| Markdown | `zk` |
| Matlab | `matlab_ls` |
| MDX | `mdx_analyzer` |
-| Meson | `swift_mesonls` |
+| Meson | `mesonlsp` |
+| Meson (deprecated) | `swift_mesonls` |
| Metamath Zero | `mm0_ls` |
| Move | `move_analyzer` |
| Mutt | `mutt_ls` |
diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt
index b14c87e..819014c 100644
--- a/doc/mason-lspconfig-mapping.txt
+++ b/doc/mason-lspconfig-mapping.txt
@@ -102,6 +102,7 @@ markdown-oxide markdown_oxide
marksman marksman
matlab-language-server matlab_ls
mdx-analyzer mdx_analyzer
+mesonlsp mesonlsp
millet millet
metamath-zero-lsp mm0_ls
move-analyzer move_analyzer
diff --git a/doc/server-mapping.md b/doc/server-mapping.md
index 878a42a..68f7ef5 100644
--- a/doc/server-mapping.md
+++ b/doc/server-mapping.md
@@ -99,6 +99,7 @@
| [marksman](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#marksman) | [marksman](https://mason-registry.dev/registry/list#marksman) |
| [matlab_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#matlab_ls) | [matlab-language-server](https://mason-registry.dev/registry/list#matlab-language-server) |
| [mdx_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#mdx_analyzer) | [mdx-analyzer](https://mason-registry.dev/registry/list#mdx-analyzer) |
+| [mesonlsp](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#mesonlsp) | [mesonlsp](https://mason-registry.dev/registry/list#mesonlsp) |
| [millet](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#millet) | [millet](https://mason-registry.dev/registry/list#millet) |
| [mm0_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#mm0_ls) | [metamath-zero-lsp](https://mason-registry.dev/registry/list#metamath-zero-lsp) |
| [move_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#move_analyzer) | [move-analyzer](https://mason-registry.dev/registry/list#move-analyzer) |
diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua
index d0ca62c..3680135 100644
--- a/lua/mason-lspconfig/mappings/filetype.lua
+++ b/lua/mason-lspconfig/mappings/filetype.lua
@@ -116,7 +116,7 @@ return {
matlab = { "matlab_ls" },
mdx = { "tailwindcss" },
menhir = { "ocamllsp" },
- meson = { "swift_mesonls" },
+ meson = { "mesonlsp", "swift_mesonls" },
["metamath-zero"] = { "mm0_ls" },
move = { "move_analyzer" },
mustache = { "tailwindcss" },
diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua
index 6cdb904..6e9bedf 100644
--- a/lua/mason-lspconfig/mappings/server.lua
+++ b/lua/mason-lspconfig/mappings/server.lua
@@ -170,6 +170,7 @@ M.lspconfig_to_package = {
["svlangserver"] = "svlangserver",
["svls"] = "svls",
["swift_mesonls"] = "swift-mesonlsp",
+ ["mesonlsp"] = "mesonlsp",
["tailwindcss"] = "tailwindcss-language-server",
["taplo"] = "taplo",
["teal_ls"] = "teal-language-server",