diff options
Diffstat (limited to 'script/config')
| -rw-r--r-- | script/config/config.lua | 16 | ||||
| -rw-r--r-- | script/config/loader.lua | 16 |
2 files changed, 8 insertions, 24 deletions
diff --git a/script/config/config.lua b/script/config/config.lua index 614c3029..3c9a6bba 100644 --- a/script/config/config.lua +++ b/script/config/config.lua @@ -214,22 +214,6 @@ local Template = { ['editor.acceptSuggestionOnEnter'] = Type.String >> 'on', } ----@alias config.scope '"specified"'|'"folder"'|'"global"' - -local configs = { - specified = {}, - ---@type {uri: uri, config: table}[] - folder = {}, - global = {}, -} - -local rawConfigs = { - specified = {}, - ---@type {uri: uri, config: table}[] - folder = {}, - global = {}, -} - local config = {} local rawConfig = {} diff --git a/script/config/loader.lua b/script/config/loader.lua index 072a9c71..69daf417 100644 --- a/script/config/loader.lua +++ b/script/config/loader.lua @@ -16,8 +16,8 @@ end local m = {} -function m.loadRCConfig(filename) - local path = workspace.getAbsolutePath(filename) +function m.loadRCConfig(uri, filename) + local path = workspace.getAbsolutePath(uri, filename) if not path then m.lastRCConfig = nil return nil @@ -75,27 +75,27 @@ function m.loadLocalConfig(filename) end ---@async -function m.loadClientConfig() +function m.loadClientConfig(uri) local configs = proto.awaitRequest('workspace/configuration', { items = { { - scopeUri = workspace.rootUri, + scopeUri = uri, section = 'Lua', }, { - scopeUri = workspace.rootUri, + scopeUri = uri, section = 'files.associations', }, { - scopeUri = workspace.rootUri, + scopeUri = uri, section = 'files.exclude', }, { - scopeUri = workspace.rootUri, + scopeUri = uri, section = 'editor.semanticHighlighting.enabled', }, { - scopeUri = workspace.rootUri, + scopeUri = uri, section = 'editor.acceptSuggestionOnEnter', }, }, |