Merge branch 'vgg' into 22-autocommands22-autocommands

1 files changed, 14 insertions, 19 deletions

diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua
index 2ee88db..f4e4abb 100644
--- a/lua/user/lsp/settings/jsonls.lua
+++ b/lua/user/lsp/settings/jsonls.lua
@@ -1,9 +1,4 @@
-local default_schemas = nil
-local status_ok, jsonls_settings = pcall(require, "nlspsettings.jsonls")
-if status_ok then
-  default_schemas = jsonls_settings.get_default_schemas()
-end
-
+-- Find more schemas here: https://www.schemastore.org/json/
 local schemas = {
   {
     description = "TypeScript compiler configuration file",
@@ -168,22 +163,10 @@ local schemas = {
   },
 }
 
-local function extend(tab1, tab2)
-  if tab2 == nil then
-    return tab2
-  end
-  for _, value in ipairs(tab2) do
-    table.insert(tab1, value)
-  end
-  return tab1
-end
-
-local extended_schemas = extend(schemas, default_schemas)
-
 local opts = {
   settings = {
     json = {
-      schemas = extended_schemas,
+      schemas = schemas,
     },
   },
   setup = {
@@ -198,3 +181,15 @@ local opts = {
 }
 
 return opts
+
+local function extend(tab1, tab2)
+  if tab2 == nil then
+    return tab2
+  end
+  for _, value in ipairs(tab2) do
+    table.insert(tab1, value)
+  end
+  return tab1
+end
+
+local extended_schemas = extend(schemas, default_schemas)