From 4e806b2056ccad2e5ea2df663742c968c4856120 Mon Sep 17 00:00:00 2001 From: Jeff Smick Date: Wed, 6 Nov 2024 08:54:16 -0800 Subject: [PATCH 1/4] feat(buf_ls): add buf_ls support --- README.md | 1 + doc/mason-lspconfig-mapping.txt | 3 ++- doc/server-mapping.md | 3 ++- lua/mason-lspconfig/mappings/server.lua | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f7e0792d..40529618c 100644 --- a/README.md +++ b/README.md @@ -344,6 +344,7 @@ local DEFAULT_SETTINGS = { | PowerShell | [`powershell_es`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#powershell_es) | | Prisma | [`prismals`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#prismals) | | Protobuf | [`bufls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bufls) | +| Protobuf | [`buf_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#buf_ls) | | Protobuf | [`pbls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pbls) | | Puppet | [`puppet`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#puppet) | | PureScript | [`purescriptls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#purescriptls) | diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt index 229e31800..2f038b5e0 100644 --- a/doc/mason-lspconfig-mapping.txt +++ b/doc/mason-lspconfig-mapping.txt @@ -23,6 +23,7 @@ biome biome brighterscript bright_script bsl-language-server bsl_ls buf-language-server bufls +buf buf_ls bzl bzl cairo-language-server cairo_ls clangd clangd @@ -223,4 +224,4 @@ yaml-language-server yamlls zk zk zls zls -vim:tw=78:ft=help:norl:expandtab:sw=4 \ No newline at end of file +vim:tw=78:ft=help:norl:expandtab:sw=4 diff --git a/doc/server-mapping.md b/doc/server-mapping.md index 9df7bdc57..07a7381f9 100644 --- a/doc/server-mapping.md +++ b/doc/server-mapping.md @@ -20,6 +20,7 @@ | [bright_script](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bright_script) | [brighterscript](https://mason-registry.dev/registry/list#brighterscript) | | [bsl_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bsl_ls) | [bsl-language-server](https://mason-registry.dev/registry/list#bsl-language-server) | | [bufls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bufls) | [buf-language-server](https://mason-registry.dev/registry/list#buf-language-server) | +| [buf_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#buf_ls) | [buf](https://mason-registry.dev/registry/list#buf) | | [bzl](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bzl) | [bzl](https://mason-registry.dev/registry/list#bzl) | | [cairo_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#cairo_ls) | [cairo-language-server](https://mason-registry.dev/registry/list#cairo-language-server) | | [clangd](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#clangd) | [clangd](https://mason-registry.dev/registry/list#clangd) | @@ -218,4 +219,4 @@ | [wgsl_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#wgsl_analyzer) | [wgsl-analyzer](https://mason-registry.dev/registry/list#wgsl-analyzer) | | [yamlls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#yamlls) | [yaml-language-server](https://mason-registry.dev/registry/list#yaml-language-server) | | [zk](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zk) | [zk](https://mason-registry.dev/registry/list#zk) | -| [zls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zls) | [zls](https://mason-registry.dev/registry/list#zls) | \ No newline at end of file +| [zls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zls) | [zls](https://mason-registry.dev/registry/list#zls) | diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua index 09a3fc26b..93055b24f 100644 --- a/lua/mason-lspconfig/mappings/server.lua +++ b/lua/mason-lspconfig/mappings/server.lua @@ -23,6 +23,7 @@ M.lspconfig_to_package = { ["bright_script"] = "brighterscript", ["bsl_ls"] = "bsl-language-server", ["bufls"] = "buf-language-server", + ["buf_ls"] = "buf", ["bzl"] = "bzl", ["cairo_ls"] = "cairo-language-server", ["clangd"] = "clangd", From 65d826a42438a75d8a0f1fd3a752e6b1554de992 Mon Sep 17 00:00:00 2001 From: Jeff Smick Date: Thu, 21 Nov 2024 16:16:52 -0800 Subject: [PATCH 2/4] remove bufls --- README.md | 1 - doc/mason-lspconfig-mapping.txt | 1 - doc/server-mapping.md | 1 - lua/mason-lspconfig/mappings/server.lua | 1 - 4 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 40529618c..551b17df4 100644 --- a/README.md +++ b/README.md @@ -343,7 +343,6 @@ local DEFAULT_SETTINGS = { | PICO-8 | [`pico8_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pico8_ls) | | PowerShell | [`powershell_es`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#powershell_es) | | Prisma | [`prismals`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#prismals) | -| Protobuf | [`bufls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bufls) | | Protobuf | [`buf_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#buf_ls) | | Protobuf | [`pbls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pbls) | | Puppet | [`puppet`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#puppet) | diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt index 2f038b5e0..23b5f7fc9 100644 --- a/doc/mason-lspconfig-mapping.txt +++ b/doc/mason-lspconfig-mapping.txt @@ -22,7 +22,6 @@ bicep-lsp bicep biome biome brighterscript bright_script bsl-language-server bsl_ls -buf-language-server bufls buf buf_ls bzl bzl cairo-language-server cairo_ls diff --git a/doc/server-mapping.md b/doc/server-mapping.md index 07a7381f9..64be269c6 100644 --- a/doc/server-mapping.md +++ b/doc/server-mapping.md @@ -19,7 +19,6 @@ | [biome](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#biome) | [biome](https://mason-registry.dev/registry/list#biome) | | [bright_script](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bright_script) | [brighterscript](https://mason-registry.dev/registry/list#brighterscript) | | [bsl_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bsl_ls) | [bsl-language-server](https://mason-registry.dev/registry/list#bsl-language-server) | -| [bufls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bufls) | [buf-language-server](https://mason-registry.dev/registry/list#buf-language-server) | | [buf_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#buf_ls) | [buf](https://mason-registry.dev/registry/list#buf) | | [bzl](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#bzl) | [bzl](https://mason-registry.dev/registry/list#bzl) | | [cairo_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#cairo_ls) | [cairo-language-server](https://mason-registry.dev/registry/list#cairo-language-server) | diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua index 93055b24f..b8ab3bff2 100644 --- a/lua/mason-lspconfig/mappings/server.lua +++ b/lua/mason-lspconfig/mappings/server.lua @@ -22,7 +22,6 @@ M.lspconfig_to_package = { ["biome"] = "biome", ["bright_script"] = "brighterscript", ["bsl_ls"] = "bsl-language-server", - ["bufls"] = "buf-language-server", ["buf_ls"] = "buf", ["bzl"] = "bzl", ["cairo_ls"] = "cairo-language-server", From 1c79cb33c9b79aca6006df621ef6ff1623df5a7f Mon Sep 17 00:00:00 2001 From: "williambotman[bot]" Date: Fri, 20 Dec 2024 03:24:45 +0000 Subject: [PATCH 3/4] fixup --- README.md | 1 + doc/mason-lspconfig-mapping.txt | 2 +- doc/server-mapping.md | 2 +- lua/mason-lspconfig/mappings/filetype.lua | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6592cad99..44d919b4a 100644 --- a/README.md +++ b/README.md @@ -266,6 +266,7 @@ local DEFAULT_SETTINGS = { | HTMX | [`htmx`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#htmx) | | Hypr | [`hyprls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#hyprls) | | Java | [`ast_grep`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ast_grep) | +| Java | [`harper_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#harper_ls) | | Java | [`java_language_server`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#java_language_server) | | Java | [`jdtls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#jdtls) | | JavaScript | [`ast_grep`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ast_grep) | diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt index 8cc99ea15..be98565c0 100644 --- a/doc/mason-lspconfig-mapping.txt +++ b/doc/mason-lspconfig-mapping.txt @@ -224,4 +224,4 @@ yaml-language-server yamlls zk zk zls zls -vim:tw=78:ft=help:norl:expandtab:sw=4 +vim:tw=78:ft=help:norl:expandtab:sw=4 \ No newline at end of file diff --git a/doc/server-mapping.md b/doc/server-mapping.md index 32520ff9a..781c8f672 100644 --- a/doc/server-mapping.md +++ b/doc/server-mapping.md @@ -219,4 +219,4 @@ | [wgsl_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#wgsl_analyzer) | [wgsl-analyzer](https://mason-registry.dev/registry/list#wgsl-analyzer) | | [yamlls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#yamlls) | [yaml-language-server](https://mason-registry.dev/registry/list#yaml-language-server) | | [zk](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zk) | [zk](https://mason-registry.dev/registry/list#zk) | -| [zls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zls) | [zls](https://mason-registry.dev/registry/list#zls) | +| [zls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#zls) | [zls](https://mason-registry.dev/registry/list#zls) | \ No newline at end of file diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua index d799f93c2..74a14e537 100644 --- a/lua/mason-lspconfig/mappings/filetype.lua +++ b/lua/mason-lspconfig/mappings/filetype.lua @@ -156,7 +156,7 @@ return { plaintex = { "ltex", "texlab" }, postcss = { "tailwindcss", "unocss" }, prisma = { "prismals" }, - proto = { "bufls", "clangd", "pbls" }, + proto = { "buf_ls", "clangd", "pbls" }, ps1 = { "powershell_es" }, pug = { "emmet_language_server", "emmet_ls" }, puppet = { "puppet" }, From 14e442d891d83f08e8ab6ff23d5a677bc3055df1 Mon Sep 17 00:00:00 2001 From: William Boman Date: Fri, 20 Dec 2024 04:32:17 +0100 Subject: [PATCH 4/4] more deprecations --- README.md | 2 -- doc/mason-lspconfig-mapping.txt | 2 -- doc/server-mapping.md | 2 -- lua/mason-lspconfig/mappings/filetype.lua | 4 ++-- lua/mason-lspconfig/mappings/server.lua | 2 -- scripts/lua/mason-scripts/mason-lspconfig/generate.lua | 6 ++++-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 44d919b4a..22cbf4bb6 100644 --- a/README.md +++ b/README.md @@ -359,7 +359,6 @@ local DEFAULT_SETTINGS = { | Python | [`pyre`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pyre) | | Python | [`pyright`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#pyright) | | Python | [`ruff`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ruff) | -| Python | [`ruff_lsp`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ruff_lsp) | | Python | [`sourcery`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#sourcery) | | Raku | [`raku_navigator`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#raku_navigator) | | Reason | [`reason_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#reason_ls) | @@ -429,7 +428,6 @@ local DEFAULT_SETTINGS = { | TypeScript | [`vtsls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#vtsls) | | Typespec | [`tsp_server`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#tsp_server) | | Typst | [`tinymist`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#tinymist) | -| Typst | [`typst_lsp`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#typst_lsp) | | Vala | [`vala_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#vala_ls) | | Verilog | [`hdl_checker`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#hdl_checker) | | Veryl | [`veryl_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#veryl_ls) | diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt index be98565c0..53c427e5a 100644 --- a/doc/mason-lspconfig-mapping.txt +++ b/doc/mason-lspconfig-mapping.txt @@ -158,7 +158,6 @@ rome rome rubocop rubocop ruby-lsp ruby_lsp ruff ruff -ruff-lsp ruff_lsp rust-analyzer rust_analyzer salt-lsp salt_ls serve-d serve_d @@ -204,7 +203,6 @@ typescript-language-server ts_ls tsp-server tsp_server twiggy-language-server twiggy_language_server typos-lsp typos_lsp -typst-lsp typst_lsp unocss-language-server unocss v-analyzer v_analyzer vacuum vacuum diff --git a/doc/server-mapping.md b/doc/server-mapping.md index 781c8f672..2b403a7d9 100644 --- a/doc/server-mapping.md +++ b/doc/server-mapping.md @@ -155,7 +155,6 @@ | [rubocop](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#rubocop) | [rubocop](https://mason-registry.dev/registry/list#rubocop) | | [ruby_lsp](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ruby_lsp) | [ruby-lsp](https://mason-registry.dev/registry/list#ruby-lsp) | | [ruff](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ruff) | [ruff](https://mason-registry.dev/registry/list#ruff) | -| [ruff_lsp](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#ruff_lsp) | [ruff-lsp](https://mason-registry.dev/registry/list#ruff-lsp) | | [rust_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#rust_analyzer) | [rust-analyzer](https://mason-registry.dev/registry/list#rust-analyzer) | | [salt_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#salt_ls) | [salt-lsp](https://mason-registry.dev/registry/list#salt-lsp) | | [serve_d](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#serve_d) | [serve-d](https://mason-registry.dev/registry/list#serve-d) | @@ -201,7 +200,6 @@ | [tsp_server](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#tsp_server) | [tsp-server](https://mason-registry.dev/registry/list#tsp-server) | | [twiggy_language_server](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#twiggy_language_server) | [twiggy-language-server](https://mason-registry.dev/registry/list#twiggy-language-server) | | [typos_lsp](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#typos_lsp) | [typos-lsp](https://mason-registry.dev/registry/list#typos-lsp) | -| [typst_lsp](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#typst_lsp) | [typst-lsp](https://mason-registry.dev/registry/list#typst-lsp) | | [unocss](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#unocss) | [unocss-language-server](https://mason-registry.dev/registry/list#unocss-language-server) | | [v_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#v_analyzer) | [v-analyzer](https://mason-registry.dev/registry/list#v-analyzer) | | [vacuum](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#vacuum) | [vacuum](https://mason-registry.dev/registry/list#vacuum) | diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua index 74a14e537..71f4f253d 100644 --- a/lua/mason-lspconfig/mappings/filetype.lua +++ b/lua/mason-lspconfig/mappings/filetype.lua @@ -161,7 +161,7 @@ return { pug = { "emmet_language_server", "emmet_ls" }, puppet = { "puppet" }, purescript = { "purescriptls" }, - python = { "ast_grep", "basedpyright", "dprint", "harper_ls", "jedi_language_server", "pylsp", "pylyzer", "pyre", "pyright", "ruff", "ruff_lsp", "snyk_ls", "sourcery" }, + python = { "ast_grep", "basedpyright", "dprint", "harper_ls", "jedi_language_server", "pylsp", "pylyzer", "pyre", "pyright", "ruff", "snyk_ls", "sourcery" }, ql = { "codeqlls" }, quarto = { "ltex" }, r = { "r_language_server" }, @@ -213,7 +213,7 @@ return { ["typescript.tsx"] = { "angularls", "biome", "denols", "eslint", "rome", "ts_ls", "vtsls" }, typescriptreact = { "angularls", "biome", "cssmodules_ls", "denols", "dprint", "emmet_language_server", "emmet_ls", "eslint", "graphql", "harper_ls", "htmx", "rome", "sourcery", "tailwindcss", "ts_ls", "unocss", "vtsls" }, typespec = { "tsp_server" }, - typst = { "tinymist", "typst_lsp" }, + typst = { "tinymist" }, v = { "v_analyzer", "vls" }, vala = { "vala_ls" }, vb = { "omnisharp", "omnisharp_mono" }, diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua index ca4a6d536..75ee02d7f 100644 --- a/lua/mason-lspconfig/mappings/server.lua +++ b/lua/mason-lspconfig/mappings/server.lua @@ -158,7 +158,6 @@ M.lspconfig_to_package = { ["rubocop"] = "rubocop", ["ruby_lsp"] = "ruby-lsp", ["ruff"] = "ruff", - ["ruff_lsp"] = "ruff-lsp", ["rust_analyzer"] = "rust-analyzer", ["salt_ls"] = "salt-lsp", ["serve_d"] = "serve-d", @@ -205,7 +204,6 @@ M.lspconfig_to_package = { ["twiggy_language_server"] = "twiggy-language-server", ["typos_lsp"] = "typos-lsp", ["tinymist"] = "tinymist", - ["typst_lsp"] = "typst-lsp", ["unocss"] = "unocss-language-server", ["v_analyzer"] = "v-analyzer", ["vacuum"] = "vacuum", diff --git a/scripts/lua/mason-scripts/mason-lspconfig/generate.lua b/scripts/lua/mason-scripts/mason-lspconfig/generate.lua index 5d9e72a4b..61356ef0a 100644 --- a/scripts/lua/mason-scripts/mason-lspconfig/generate.lua +++ b/scripts/lua/mason-scripts/mason-lspconfig/generate.lua @@ -20,8 +20,10 @@ local function create_lspconfig_filetype_map() local filetype_map = {} for _, server_name in ipairs(_.keys(lspconfig_server_mapping.lspconfig_to_package)) do - local config = - assert(lspconfig[server_name], ("Failed to get config for %s"):format(server_name)).document_config + local config = assert( + lspconfig[server_name] and lspconfig[server_name].document_config, + ("Failed to get config for %s"):format(server_name) + ) for _, filetype in ipairs(config.default_config.filetypes or {}) do if not filetype_map[filetype] then filetype_map[filetype] = {}