diff --git a/README.md b/README.md index 916202f19..eb1b57542 100644 --- a/README.md +++ b/README.md @@ -424,6 +424,7 @@ local DEFAULT_SETTINGS = { | TypeScript | [`rome`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#rome) | | TypeScript | [`tsserver`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tsserver) | | TypeScript | [`vtsls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#vtsls) | +| Typespec | [`tsp_server`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tsp_server) | | Typst | [`tinymist`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tinymist) | | Typst | [`typst_lsp`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#typst_lsp) | | Vala | [`vala_ls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#vala_ls) | diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt index 880bd2ffa..a7c1bdb81 100644 --- a/doc/mason-lspconfig-mapping.txt +++ b/doc/mason-lspconfig-mapping.txt @@ -198,6 +198,7 @@ tflint tflint shopify-theme-check theme_check thriftls thriftls tinymist tinymist +tsp-server tsp_server typescript-language-server tsserver twiggy-language-server twiggy_language_server typos-lsp typos_lsp diff --git a/doc/server-mapping.md b/doc/server-mapping.md index 9e2464560..fc523309a 100644 --- a/doc/server-mapping.md +++ b/doc/server-mapping.md @@ -195,6 +195,7 @@ | [theme_check](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#theme_check) | [shopify-theme-check](https://mason-registry.dev/registry/list#shopify-theme-check) | | [thriftls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#thriftls) | [thriftls](https://mason-registry.dev/registry/list#thriftls) | | [tinymist](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tinymist) | [tinymist](https://mason-registry.dev/registry/list#tinymist) | +| [tsp_server](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tsp_server) | [tsp-server](https://mason-registry.dev/registry/list#tsp-server) | | [tsserver](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tsserver) | [typescript-language-server](https://mason-registry.dev/registry/list#typescript-language-server) | | [twiggy_language_server](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.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/server_configurations.md#typos_lsp) | [typos-lsp](https://mason-registry.dev/registry/list#typos-lsp) | diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua index bdfa22028..21c62fc44 100644 --- a/lua/mason-lspconfig/mappings/filetype.lua +++ b/lua/mason-lspconfig/mappings/filetype.lua @@ -12,16 +12,16 @@ return { apexcode = { "apex_ls" }, arduino = { "arduino_language_server" }, asm = { "asm_lsp" }, - aspnetcorerazor = { "htmx", "tailwindcss" }, - astro = { "astro", "biome", "emmet_ls", "eslint", "htmx", "tailwindcss" }, - ["astro-markdown"] = { "htmx", "tailwindcss" }, + aspnetcorerazor = { "tailwindcss" }, + astro = { "astro", "biome", "emmet_ls", "eslint", "tailwindcss" }, + ["astro-markdown"] = { "tailwindcss" }, automake = { "autotools_ls" }, awk = { "awk_ls" }, bean = { "beancount" }, beancount = { "beancount" }, bib = { "ltex", "texlab" }, bicep = { "bicep" }, - blade = { "htmx", "stimulus_ls", "tailwindcss" }, + blade = { "stimulus_ls", "tailwindcss" }, brs = { "bright_script" }, bsl = { "bsl_ls" }, bzl = { "bzl", "starlark_rust", "starpls" }, @@ -29,7 +29,7 @@ return { cairo = { "cairo_ls" }, clar = { "clarity_lsp" }, clarity = { "clarity_lsp" }, - clojure = { "clojure_lsp", "htmx", "tailwindcss" }, + clojure = { "clojure_lsp", "tailwindcss" }, cmake = { "cmake", "neocmake" }, cobol = { "cobol_ls" }, comp = { "glsl_analyzer", "glslls" }, @@ -48,22 +48,22 @@ return { d = { "serve_d" }, dart = { "ast_grep" }, dhall = { "dhall_lsp_server" }, - ["django-html"] = { "htmx", "tailwindcss" }, + ["django-html"] = { "tailwindcss" }, dockerfile = { "dockerls" }, dot = { "dotls" }, drools = { "drools_lsp" }, dune = { "ocamllsp" }, earthfile = { "earthlyls" }, - edge = { "htmx", "tailwindcss" }, + edge = { "tailwindcss" }, edn = { "clojure_lsp" }, - eelixir = { "elixirls", "htmx", "lexical", "tailwindcss" }, - ejs = { "htmx", "tailwindcss" }, - elixir = { "elixirls", "htmx", "lexical", "tailwindcss" }, + eelixir = { "elixirls", "lexical", "tailwindcss" }, + ejs = { "tailwindcss" }, + elixir = { "elixirls", "lexical", "tailwindcss" }, elm = { "elmls" }, - erb = { "htmx", "tailwindcss" }, + erb = { "tailwindcss" }, erg = { "erg_language_server" }, erlang = { "elp", "erlangls" }, - eruby = { "emmet_language_server", "emmet_ls", "htmx", "ruby_lsp", "steep", "stimulus_ls", "tailwindcss" }, + eruby = { "emmet_language_server", "emmet_ls", "ruby_lsp", "steep", "stimulus_ls", "tailwindcss" }, fennel = { "fennel_language_server", "fennel_ls" }, flux = { "flux_lsp" }, foam = { "foam_ls" }, @@ -76,34 +76,34 @@ return { gitcommit = { "harper_ls", "ltex" }, glsl = { "glsl_analyzer", "glslls" }, go = { "ast_grep", "golangci_lint_ls", "gopls", "harper_ls", "snyk_ls" }, - gohtml = { "htmx", "tailwindcss" }, - gohtmltmpl = { "htmx", "tailwindcss" }, + gohtml = { "tailwindcss" }, + gohtmltmpl = { "tailwindcss" }, gomod = { "golangci_lint_ls", "gopls", "snyk_ls" }, gotmpl = { "gopls" }, gowork = { "gopls" }, graphql = { "graphql" }, groovy = { "gradle_ls", "groovyls" }, - haml = { "htmx", "tailwindcss" }, - handlebars = { "ember", "glint", "htmx", "tailwindcss" }, + haml = { "tailwindcss" }, + handlebars = { "ember", "glint", "tailwindcss" }, haskell = { "hls" }, haxe = { "haxe_language_server" }, - hbs = { "htmx", "tailwindcss" }, - heex = { "elixirls", "htmx", "lexical", "tailwindcss" }, + hbs = { "tailwindcss" }, + heex = { "elixirls", "lexical", "tailwindcss" }, helm = { "helm_ls", "snyk_ls" }, hoon = { "hoon_ls" }, html = { "angularls", "antlersls", "ast_grep", "emmet_language_server", "emmet_ls", "harper_ls", "html", "htmx", "ltex", "lwc_ls", "stimulus_ls", "tailwindcss", "unocss" }, - ["html-eex"] = { "htmx", "tailwindcss" }, + ["html-eex"] = { "tailwindcss" }, ["html.handlebars"] = { "glint" }, - htmlangular = { "angularls", "emmet_language_server", "emmet_ls", "htmx", "tailwindcss" }, - htmldjango = { "emmet_language_server", "emmet_ls", "htmx", "tailwindcss" }, + htmlangular = { "angularls", "emmet_language_server", "emmet_ls", "tailwindcss" }, + htmldjango = { "emmet_language_server", "emmet_ls", "tailwindcss" }, ["hypr*.conf"] = { "hyprls" }, hyprlang = { "hyprls" }, - jade = { "htmx", "tailwindcss" }, + jade = { "tailwindcss" }, java = { "ast_grep", "harper_ls", "java_language_server", "jdtls" }, - javascript = { "ast_grep", "biome", "cssmodules_ls", "denols", "dprint", "ember", "eslint", "glint", "harper_ls", "htmx", "lwc_ls", "quick_lint_js", "rome", "snyk_ls", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "vtsls" }, + javascript = { "ast_grep", "biome", "cssmodules_ls", "denols", "dprint", "ember", "eslint", "glint", "harper_ls", "lwc_ls", "quick_lint_js", "rome", "snyk_ls", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "vtsls" }, ["javascript.glimmer"] = { "ember", "glint" }, ["javascript.jsx"] = { "denols", "eslint", "tsserver", "vtsls" }, - javascriptreact = { "biome", "cssmodules_ls", "denols", "dprint", "emmet_language_server", "emmet_ls", "eslint", "graphql", "htmx", "rome", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "unocss", "vtsls" }, + javascriptreact = { "biome", "cssmodules_ls", "denols", "dprint", "emmet_language_server", "emmet_ls", "eslint", "graphql", "rome", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "unocss", "vtsls" }, jinja = { "jinja_lsp" }, jq = { "jqls" }, json = { "biome", "dprint", "jsonls", "rome", "snyk_ls", "spectral" }, @@ -112,26 +112,26 @@ return { jsonnet = { "jsonnet_ls" }, julia = { "julials" }, kotlin = { "ast_grep", "kotlin_language_server" }, - leaf = { "htmx", "tailwindcss" }, + leaf = { "tailwindcss" }, less = { "css_variables", "cssls", "emmet_language_server", "emmet_ls", "stylelint_lsp", "tailwindcss" }, lhaskell = { "hls" }, libsonnet = { "jsonnet_ls" }, - liquid = { "htmx", "shopify_theme_ls", "tailwindcss", "theme_check" }, + liquid = { "shopify_theme_ls", "tailwindcss", "theme_check" }, llw = { "lelwel_ls" }, lua = { "ast_grep", "harper_ls", "lua_ls" }, luau = { "luau_lsp" }, mail = { "ltex" }, make = { "autotools_ls" }, - markdown = { "dprint", "grammarly", "harper_ls", "htmx", "ltex", "markdown_oxide", "marksman", "prosemd_lsp", "remark_ls", "tailwindcss", "vale_ls", "zk" }, + markdown = { "dprint", "grammarly", "harper_ls", "ltex", "markdown_oxide", "marksman", "prosemd_lsp", "remark_ls", "tailwindcss", "vale_ls", "zk" }, ["markdown.mdx"] = { "marksman", "mdx_analyzer" }, matlab = { "matlab_ls" }, - mdx = { "htmx", "tailwindcss" }, + mdx = { "tailwindcss" }, menhir = { "ocamllsp" }, meson = { "mesonlsp", "swift_mesonls" }, ["metamath-zero"] = { "mm0_ls" }, motoko = { "motoko_lsp" }, move = { "move_analyzer" }, - mustache = { "htmx", "tailwindcss" }, + mustache = { "tailwindcss" }, muttrc = { "mutt_ls" }, mysql = { "sqlls", "sqls" }, ncl = { "nickel_ls" }, @@ -140,8 +140,8 @@ return { nickel = { "nickel_ls" }, nim = { "nim_langserver", "nimls" }, nix = { "nil_ls", "rnix" }, - njk = { "htmx", "tailwindcss" }, - nunjucks = { "htmx", "tailwindcss" }, + njk = { "tailwindcss" }, + nunjucks = { "tailwindcss" }, objc = { "clangd" }, objcpp = { "clangd" }, ocaml = { "ocamllsp" }, @@ -156,7 +156,7 @@ return { pandoc = { "ltex" }, perl = { "perlnavigator" }, pest = { "pest_ls" }, - php = { "htmx", "intelephense", "phpactor", "psalm", "stimulus_ls", "tailwindcss" }, + php = { "intelephense", "phpactor", "psalm", "stimulus_ls", "tailwindcss" }, plaintex = { "ltex", "texlab" }, postcss = { "tailwindcss" }, prisma = { "prismals" }, @@ -170,11 +170,11 @@ return { quarto = { "ltex" }, r = { "r_language_server" }, raku = { "raku_navigator" }, - razor = { "htmx", "tailwindcss" }, - reason = { "htmx", "ocamllsp", "reason_ls", "tailwindcss" }, + razor = { "tailwindcss" }, + reason = { "ocamllsp", "reason_ls", "tailwindcss" }, rego = { "regal", "regols" }, requirements = { "snyk_ls" }, - rescript = { "htmx", "rescriptls", "tailwindcss", "unocss" }, + rescript = { "rescriptls", "tailwindcss", "unocss" }, rmd = { "ltex", "r_language_server" }, rnoweb = { "ltex" }, robot = { "robotframework_ls" }, @@ -185,7 +185,7 @@ return { sass = { "emmet_language_server", "emmet_ls", "somesass_ls", "tailwindcss" }, scss = { "css_variables", "cssls", "emmet_language_server", "emmet_ls", "somesass_ls", "stylelint_lsp", "tailwindcss" }, sh = { "bashls" }, - slim = { "htmx", "tailwindcss" }, + slim = { "tailwindcss" }, slint = { "slint_lsp" }, sls = { "salt_ls" }, smithy = { "smithy_ls" }, @@ -196,7 +196,7 @@ return { stylus = { "tailwindcss" }, sugarss = { "stylelint_lsp", "tailwindcss" }, surface = { "elixirls", "lexical" }, - svelte = { "biome", "emmet_ls", "eslint", "htmx", "svelte", "tailwindcss", "unocss" }, + svelte = { "biome", "emmet_ls", "eslint", "svelte", "tailwindcss", "unocss" }, svg = { "lemminx" }, swift = { "harper_ls" }, systemverilog = { "hdl_checker", "svlangserver", "svls", "verible" }, @@ -210,11 +210,12 @@ return { text = { "ltex", "textlsp", "vale_ls" }, thrift = { "thriftls" }, toml = { "dprint", "harper_ls", "taplo" }, - twig = { "htmx", "tailwindcss", "twiggy_language_server" }, - typescript = { "angularls", "ast_grep", "biome", "cssmodules_ls", "denols", "dprint", "ember", "eslint", "glint", "harper_ls", "htmx", "quick_lint_js", "rome", "snyk_ls", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "vtsls" }, + twig = { "tailwindcss", "twiggy_language_server" }, + typescript = { "angularls", "ast_grep", "biome", "cssmodules_ls", "denols", "dprint", "ember", "eslint", "glint", "harper_ls", "quick_lint_js", "rome", "snyk_ls", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "vtsls" }, ["typescript.glimmer"] = { "ember", "glint" }, ["typescript.tsx"] = { "angularls", "biome", "denols", "eslint", "rome", "tsserver", "vtsls" }, - typescriptreact = { "angularls", "biome", "cssmodules_ls", "denols", "dprint", "emmet_language_server", "emmet_ls", "eslint", "graphql", "harper_ls", "htmx", "rome", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "unocss", "vtsls" }, + typescriptreact = { "angularls", "biome", "cssmodules_ls", "denols", "dprint", "emmet_language_server", "emmet_ls", "eslint", "graphql", "harper_ls", "rome", "sourcery", "stylelint_lsp", "tailwindcss", "tsserver", "unocss", "vtsls" }, + typespec = { "tsp_server" }, typst = { "tinymist", "typst_lsp" }, v = { "v_analyzer", "vls" }, vala = { "vala_ls" }, @@ -229,7 +230,7 @@ return { vlang = { "vls" }, vmasm = { "asm_lsp" }, vsh = { "v_analyzer" }, - vue = { "biome", "emmet_ls", "eslint", "htmx", "stylelint_lsp", "tailwindcss", "unocss", "volar", "vuels" }, + vue = { "biome", "emmet_ls", "eslint", "stylelint_lsp", "tailwindcss", "unocss", "volar", "vuels" }, vv = { "v_analyzer" }, wgsl = { "wgsl_analyzer" }, wxss = { "stylelint_lsp" }, diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua index 3ce40f25c..b5d7fd37a 100644 --- a/lua/mason-lspconfig/mappings/server.lua +++ b/lua/mason-lspconfig/mappings/server.lua @@ -198,6 +198,7 @@ M.lspconfig_to_package = { ["tflint"] = "tflint", ["theme_check"] = "shopify-theme-check", ["thriftls"] = "thriftls", + ["tsp_server"] = "tsp-server", ["tsserver"] = "typescript-language-server", ["twiggy_language_server"] = "twiggy-language-server", ["typos_lsp"] = "typos-lsp",