From 94c444e000f6940133b4c8f04b0a1aea7d95c0a9 Mon Sep 17 00:00:00 2001 From: William Boman Date: Wed, 11 May 2022 15:56:17 +0200 Subject: chore!: remove spectral This server's installation method is too unstable to currently support. It's also deprecated [1]. [1] https://github.com/stoplightio/vscode-spectral/issues/130 --- README.md | 2 -- lua/nvim-lsp-installer/_generated/filetype_map.lua | 5 ++-- .../_generated/language_autocomplete_map.lua | 2 -- lua/nvim-lsp-installer/_generated/metadata.lua | 3 --- .../_generated/schemas/spectral.lua | 3 --- lua/nvim-lsp-installer/servers/init.lua | 1 - lua/nvim-lsp-installer/servers/spectral/init.lua | 28 ---------------------- 7 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 lua/nvim-lsp-installer/_generated/schemas/spectral.lua delete mode 100644 lua/nvim-lsp-installer/servers/spectral/init.lua diff --git a/README.md b/README.md index a6e314bc..6bd4a5c1 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,6 @@ require("nvim-lsp-installer").setup({ | Arduino [(docs!!!)][arduino] | `arduino_language_server` | | Assembly (GAS/NASM, GO) | `asm_lsp` | | Astro | `astro` | -| AsyncAPI | `spectral` | | Bash | `bashls` | | Beancount | `beancount` | | Bicep | `bicep` | @@ -254,7 +253,6 @@ require("nvim-lsp-installer").setup({ | OCaml | `ocamllsp` | | Objective C | `ccls` | | OneScript, 1C:Enterprise | `bsl_ls` | -| OpenAPI | `spectral` | | OpenCL | `opencl_ls` | | PHP | `intelephense` | | PHP | `phpactor` | diff --git a/lua/nvim-lsp-installer/_generated/filetype_map.lua b/lua/nvim-lsp-installer/_generated/filetype_map.lua index 45707ee1..d5135775 100644 --- a/lua/nvim-lsp-installer/_generated/filetype_map.lua +++ b/lua/nvim-lsp-installer/_generated/filetype_map.lua @@ -66,7 +66,7 @@ return { javascript = { "cssmodules_ls", "denols", "ember", "eslint", "quick_lint_js", "rome", "stylelint_lsp", "tailwindcss", "tsserver" }, ["javascript.jsx"] = { "denols", "eslint", "tsserver" }, javascriptreact = { "cssmodules_ls", "denols", "eslint", "graphql", "rome", "stylelint_lsp", "tailwindcss", "tsserver" }, - json = { "jsonls", "rome", "spectral" }, + json = { "jsonls", "rome" }, jsonc = { "jsonls" }, jsonnet = { "jsonnet_ls" }, julia = { "julials" }, @@ -152,10 +152,9 @@ return { xsd = { "lemminx" }, xsl = { "lemminx" }, xslt = { "lemminx" }, - yaml = { "spectral", "yamlls" }, + yaml = { "yamlls" }, ["yaml.ansible"] = { "ansiblels" }, ["yaml.docker-compose"] = { "yamlls" }, - yml = { "spectral" }, zig = { "zls" }, zir = { "zls" } } \ No newline at end of file diff --git a/lua/nvim-lsp-installer/_generated/language_autocomplete_map.lua b/lua/nvim-lsp-installer/_generated/language_autocomplete_map.lua index 68279667..41f35867 100644 --- a/lua/nvim-lsp-installer/_generated/language_autocomplete_map.lua +++ b/lua/nvim-lsp-installer/_generated/language_autocomplete_map.lua @@ -6,7 +6,6 @@ return { ["assembly-gas"] = { "asm_lsp" }, ["assembly-go"] = { "asm_lsp" }, ["assembly-nasm"] = { "asm_lsp" }, - asyncapi = { "spectral" }, c = { "ccls", "clangd" }, ["c#"] = { "csharp_ls", "omnisharp" }, ["c++"] = { "ccls", "clangd" }, @@ -27,7 +26,6 @@ return { nix = { "rnix" }, ["objective-c"] = { "ccls" }, onescript = { "bsl_ls" }, - openapi = { "spectral" }, php = { "intelephense", "phpactor", "psalm" }, python = { "jedi_language_server", "pylsp", "pyright", "sourcery" }, ruby = { "solargraph", "sorbet" }, diff --git a/lua/nvim-lsp-installer/_generated/metadata.lua b/lua/nvim-lsp-installer/_generated/metadata.lua index 7ab7dcf9..d95b7468 100644 --- a/lua/nvim-lsp-installer/_generated/metadata.lua +++ b/lua/nvim-lsp-installer/_generated/metadata.lua @@ -286,9 +286,6 @@ return { sourcery = { filetypes = { "python" } }, - spectral = { - filetypes = { "yaml", "json", "yml" } - }, sqlls = { filetypes = { "sql", "mysql" } }, diff --git a/lua/nvim-lsp-installer/_generated/schemas/spectral.lua b/lua/nvim-lsp-installer/_generated/schemas/spectral.lua deleted file mode 100644 index ae9f1e62..00000000 --- a/lua/nvim-lsp-installer/_generated/schemas/spectral.lua +++ /dev/null @@ -1,3 +0,0 @@ --- THIS FILE IS GENERATED. DO NOT EDIT MANUALLY. --- stylua: ignore start -return {properties = {["spectral.enable"] = {default = true,description = "Controls whether or not Spectral is enabled.",scope = "resource",type = "boolean"},["spectral.rulesetFile"] = {description = "Location of the ruleset file to use when validating. If omitted, the default is a .spectral.yml/.spectral.json in the same folder as the document being validated. Paths are relative to the workspace.",scope = "resource",type = "string"},["spectral.run"] = {default = "onType",description = "Run the linter on save (onSave) or as you type (onType).",enum = { "onSave", "onType" },scope = "resource",type = "string"},["spectral.trace.server"] = {default = "off",description = "Traces the communication between VS Code and the language server.",enum = { "off", "messages", "verbose" },scope = "window",type = "string"},["spectral.validateFiles"] = {description = "An array of file globs (e.g., `**/*.yaml`) in minimatch glob format which should be validated by Spectral. If language identifiers are also specified, the file must match both in order to be validated.",items = {type = "string"},scope = "resource",type = "array"},["spectral.validateLanguages"] = {default = { "json", "yaml" },description = "An array of language IDs which should be validated by Spectral. If file globs are also specified, the file must match both in order to be validated.",items = {type = "string"},scope = "resource",type = "array"}},title = "Spectral",type = "object"} \ No newline at end of file diff --git a/lua/nvim-lsp-installer/servers/init.lua b/lua/nvim-lsp-installer/servers/init.lua index 6a14c376..9758a8ea 100644 --- a/lua/nvim-lsp-installer/servers/init.lua +++ b/lua/nvim-lsp-installer/servers/init.lua @@ -127,7 +127,6 @@ local CORE_SERVERS = Data.set_of { "sorbet", "sourcekit", "sourcery", - "spectral", "sqlls", "sqls", "stylelint_lsp", diff --git a/lua/nvim-lsp-installer/servers/spectral/init.lua b/lua/nvim-lsp-installer/servers/spectral/init.lua deleted file mode 100644 index c974ee7f..00000000 --- a/lua/nvim-lsp-installer/servers/spectral/init.lua +++ /dev/null @@ -1,28 +0,0 @@ -local server = require "nvim-lsp-installer.server" -local path = require "nvim-lsp-installer.path" -local git = require "nvim-lsp-installer.core.managers.git" -local npm = require "nvim-lsp-installer.core.managers.npm" - -return function(name, root_dir) - return server.Server:new { - name = name, - root_dir = root_dir, - languages = { "openapi", "asyncapi" }, - homepage = "https://stoplight.io/open-source/spectral/", - ---@param ctx InstallContext - installer = function(ctx) - git.clone({ "https://github.com/stoplightio/vscode-spectral" }).with_receipt() - ctx.spawn.npm { "install" } - ctx:chdir("server", function() - ctx.spawn.npm { "install" } - end) - pcall(npm.run, { "compile" }) - - ctx:chdir "server" - ctx.receipt:mark_invalid() -- Due to the `chdir`, we essentially erase any trace of the cloned git repo, so we mark this as invalid. - end, - default_options = { - cmd = { "node", path.concat { root_dir, "out", "server.js" }, "--stdio" }, - }, - } -end -- cgit v1.2.3-70-g09d2