load config in `.luarc.json`

2 files changed, 23 insertions, 3 deletions

diff --git a/script/config/loader.lua b/script/config/loader.lua
index 9f15830d..c7af26d9 100644
--- a/script/config/loader.lua
+++ b/script/config/loader.lua
@@ -16,6 +16,20 @@ end
 
 local m = {}
 
+function m.loadRCConfig(filename)
+    local path = fs.path(workspace.getAbsolutePath(filename))
+    local buf  = fsu.loadFile(path)
+    if not buf then
+        return
+    end
+    local suc, res = pcall(json.decode, buf)
+    if not suc then
+        errorMessage(lang.script('CONFIG_LOAD_ERROR', res))
+        return
+    end
+    return res
+end
+
 function m.loadLocalConfig(filename)
     local path = fs.path(workspace.getAbsolutePath(filename))
     local buf  = fsu.loadFile(path)
diff --git a/script/provider/provider.lua b/script/provider/provider.lua
index 0e4f7ddd..284eca97 100644
--- a/script/provider/provider.lua
+++ b/script/provider/provider.lua
@@ -22,9 +22,15 @@ local function updateConfig()
         config.setSource 'path'
         log.debug('load config from local', CONFIGPATH)
     else
-        new = cfgLoader.loadClientConfig()
-        config.setSource 'client'
-        log.debug('load config from client')
+        new = cfgLoader.loadRCConfig('.luarc.json')
+        if new then
+            config.setSource 'luarc'
+            log.debug('load config from luarc')
+        else
+            new = cfgLoader.loadClientConfig()
+            config.setSource 'client'
+            log.debug('load config from client')
+        end
     end
     if not new then
         log.warn('load config failed!')