#831

1 files changed, 12 insertions, 29 deletions

diff --git a/script/provider/provider.lua b/script/provider/provider.lua
index 8e64f5d3..addfe320 100644
--- a/script/provider/provider.lua
+++ b/script/provider/provider.lua
@@ -17,46 +17,29 @@ local converter  = require 'proto.converter'
 local filewatch  = require 'filewatch'
 local json       = require 'json'
 
-local function mergeConfig(a, b)
-    for k, v in pairs(b) do
-        if a[k] == nil then
-            a[k] = v
-        end
-    end
-end
-
 ---@async
 local function updateConfig()
-    local merged = {}
-
-    local cfg = cfgLoader.loadLocalConfig(CONFIGPATH)
-    if cfg then
-        log.debug('load config from local', CONFIGPATH)
-        -- watch directory
-        filewatch.watch(workspace.getAbsolutePath(CONFIGPATH):gsub('[^/\\]+$', ''))
-        mergeConfig(merged, cfg)
+    local clientConfig = cfgLoader.loadClientConfig()
+    if clientConfig then
+        log.debug('load config from client')
+        config.update(clientConfig, json.null)
     end
 
     local rc = cfgLoader.loadRCConfig('.luarc.json')
     if rc then
         log.debug('load config from luarc')
-        mergeConfig(merged, rc)
-    end
-
-    local clientConfig = cfgLoader.loadClientConfig()
-    if clientConfig then
-        log.debug('load config from client')
-        mergeConfig(merged, clientConfig)
+        config.update(rc, json.null)
     end
 
-    for k, v in pairs(merged) do
-        if v == json.null then
-            merged[k] = nil
-        end
+    local cfg = cfgLoader.loadLocalConfig(CONFIGPATH)
+    if cfg then
+        log.debug('load config from local', CONFIGPATH)
+        -- watch directory
+        filewatch.watch(workspace.getAbsolutePath(CONFIGPATH):gsub('[^/\\]+$', ''))
+        config.update(cfg, json.null)
     end
 
-    config.update(merged)
-    log.debug('loaded config dump:', util.dump(merged))
+    log.debug('loaded config dump:', util.dump(config.dump()))
 end
 
 ---@class provider