From 7db9bf1bb183563234acef4413a8da4e1bac5321 Mon Sep 17 00:00:00 2001 From: Moshe Avni Date: Mon, 15 Jul 2024 09:59:43 +0300 Subject: [PATCH] chore/remove-deprecated-apis --- lua/yaml-companion/builtin/kubernetes/resources.lua | 2 ++ lua/yaml-companion/config.lua | 13 ------------- lua/yaml-companion/context/init.lua | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/lua/yaml-companion/builtin/kubernetes/resources.lua b/lua/yaml-companion/builtin/kubernetes/resources.lua index 2432f04..8eb38f4 100644 --- a/lua/yaml-companion/builtin/kubernetes/resources.lua +++ b/lua/yaml-companion/builtin/kubernetes/resources.lua @@ -16,6 +16,8 @@ return { "CSIStorageCapacityList", "CertificateSigningRequest", "CertificateSigningRequestList", + "ClusterCIDR", + "ClusterCIDRList", "ClusterRole", "ClusterRoleBinding", "ClusterRoleBindingList", diff --git a/lua/yaml-companion/config.lua b/lua/yaml-companion/config.lua index 851d346..17ce531 100644 --- a/lua/yaml-companion/config.lua +++ b/lua/yaml-companion/config.lua @@ -51,19 +51,6 @@ function M.setup(options, on_attach) M.options.lspconfig.on_attach = add_hook_after(options.lspconfig.on_attach, on_attach) - local all_schemas = vim.deepcopy(M.options.schemas) - local collected_uris = {} - M.options.schemas = {} - for _, schema in pairs(all_schemas) do - if not schema.uri then - schema.uri = schema.url - end - if not collected_uris[schema.uri] then - vim.list_extend(M.options.schemas, { schema }) - collected_uris[schema.uri] = true - end - end - M.options.lspconfig.on_init = add_hook_after(options.lspconfig.on_init, function(client) client.notify("yaml/supportSchemaSelection", { {} }) return true diff --git a/lua/yaml-companion/context/init.lua b/lua/yaml-companion/context/init.lua index 56d2503..2addb2f 100644 --- a/lua/yaml-companion/context/init.lua +++ b/lua/yaml-companion/context/init.lua @@ -145,7 +145,7 @@ M.schema = function(bufnr, new_schema) new_schema = new_schema.result[1] end - if new_schema and new_schema.uri then + if new_schema and new_schema.uri and new_schema.name then M.ctxs[bufnr].schema = new_schema local bufuri = vim.uri_from_bufnr(bufnr)