From d5f370b7cea0466ceaca4af39efa2c013114f6ec Mon Sep 17 00:00:00 2001 From: William Boman Date: Sun, 31 Oct 2021 00:47:03 +0200 Subject: scripts: fix generating filetypes for servers w/ no lspconfig entry --- scripts/autogen_metadata.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/autogen_metadata.lua b/scripts/autogen_metadata.lua index c3ee0c78..0a7b6afa 100644 --- a/scripts/autogen_metadata.lua +++ b/scripts/autogen_metadata.lua @@ -18,6 +18,9 @@ for _, file in ipairs(vim.fn.glob(generated_dir .. "*", 1, 1)) do vim.fn.delete(file) end +---@param path string +---@param txt string +---@param flag string|number local function write_file(path, txt, flag) uv.fs_open(path, flag, 438, function(open_err, fd) assert(not open_err, open_err) @@ -39,18 +42,21 @@ local function write_file(path, txt, flag) end) end +---@param server Server local function get_supported_filetypes(server) - local configs = require "lspconfig/configs" - local lspconfig_server_ok = pcall(require, ("lspconfig/" .. server.name)) - if not lspconfig_server_ok then - -- This is expected behavior for servers that does not exist in lspconfig. - print(("Unable to import lspconfig/%s, continuing..."):format(server.name)) + local config = require("lspconfig")[server.name] + if not config then + -- No default server config exists in lspconfig + if server._pre_setup then + server._pre_setup() + end + config = require("lspconfig/configs")[server.name] end local default_options = server:get_default_options() local filetypes = coalesce( -- nvim-lsp-installer options has precedence default_options.filetypes, - lspconfig_server_ok and configs[server.name].document_config.default_config.filetypes, + config.document_config.default_config.filetypes, {} ) return filetypes @@ -76,6 +82,7 @@ end do local metadata = {} + ---@param server Server local function create_metadata_entry(server) return { filetypes = get_supported_filetypes(server) } end -- cgit v1.2.3-70-g09d2