summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2022-02-15 19:09:18 +0800
committer最萌小汐 <sumneko@hotmail.com>2022-02-15 19:09:18 +0800
commitbf8b18fe8d2f3cc470021e32b9d5f11ec765a643 (patch)
tree2a14d55a81d6025be148d4d78c52d077699709ef /script
parent1f8e4edb39e5aff1f209e70617019ef1cf4b2528 (diff)
downloadlua-language-server-bf8b18fe8d2f3cc470021e32b9d5f11ec765a643.zip
fix #952
Diffstat (limited to 'script')
-rw-r--r--script/client.lua4
-rw-r--r--script/library.lua1
2 files changed, 3 insertions, 2 deletions
diff --git a/script/client.lua b/script/client.lua
index 9074239a..ef390b9e 100644
--- a/script/client.lua
+++ b/script/client.lua
@@ -248,8 +248,8 @@ local function tryModifyRC(uri, finalChanges, create)
if not buf and not create then
return false
end
- local scp = scope.getScope(uri)
- local rc = scp:get('lastRCConfig') or {
+ local loader = require 'config.loader'
+ local rc = loader.loadRCConfig(uri, path) or {
['$schema'] = lang.id == 'zh-cn'
and [[https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema-zh-cn.json]]
or [[https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json]]
diff --git a/script/library.lua b/script/library.lua
index 7cac48f1..dc06f978 100644
--- a/script/library.lua
+++ b/script/library.lua
@@ -336,6 +336,7 @@ local function apply3rd(uri, cfg, onlyMemory)
changes[#changes+1] = {
key = change.key,
action = change.action,
+ prop = change.prop,
value = change.value,
uri = uri,
}