From 6477ca95d081e2b2397a993699c8ff643c632f85 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Fri, 9 Sep 2022 22:06:42 +0200 Subject: [PATCH] fix: new settings.nvim API --- .nvim.settings.json | 2 +- lua/lua-dev/lsp.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.nvim.settings.json b/.nvim.settings.json index 49de9510..a4e667d4 100644 --- a/.nvim.settings.json +++ b/.nvim.settings.json @@ -1,5 +1,5 @@ { - "lua-dev": { + "lua-dev.nvim": { "library": { "enabled": true, "plugins": [ diff --git a/lua/lua-dev/lsp.lua b/lua/lua-dev/lsp.lua index db94c7d1..bbd3eaeb 100644 --- a/lua/lua-dev/lsp.lua +++ b/lua/lua-dev/lsp.lua @@ -28,8 +28,7 @@ function M.on_new_config(config, root_dir) end pcall(function() - local settings = require("settings").get_settings({ file = root_dir, key = "lua-dev" }) - opts = vim.tbl_deep_extend("force", opts, settings) + opts = require("settings").get("lua-dev.nvim", opts, { file = root_dir }) end) pcall(opts.override, root_dir, opts.library)