Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix --configpath not load #3011

Closed
wants to merge 1 commit into from
Closed

Fix --configpath not load #3011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions script/cli/doc/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ local function getPathDocUpdate()
return section.DOC
end
end
end)
end)
if ok then
local doc_json_dir = doc_json_path:string():gsub('/doc.json', '')
return doc_json_dir, doc_path
Expand Down Expand Up @@ -131,7 +131,7 @@ local function injectBuildScript()
},
{__index = _G}))
if err or not data then
error(err, 0)
error(err, 0)
end
data()
return module
Expand Down Expand Up @@ -193,6 +193,15 @@ function doc.runCLI()

print('root uri = ' .. rootUri)

--- If '--configpath' is specified, get the folder path of the '.luarc.doc.josn' configuration file (without the file name)
--- 如果指定了'--configpath'，则获取`.luarc.doc.josn` 配置文件的文件夹路径(不包含文件名）
--- This option is passed into the callback function of the initialized method in provide.
--- 该选项会被传入到`provide`中的`initialized`方法的回调函数中
local luarcParentUri
if CONFIGPATH then
luarcParentUri = furi.encode(fs.absolute(fs.path(CONFIGPATH)):parent_path():string())
end

util.enableCloseFunction()

local lastClock = os.clock()
Expand All @@ -203,6 +212,7 @@ function doc.runCLI()

client:initialize {
rootUri = rootUri,
luarcParentUri = luarcParentUri
}
io.write(lang.script('CLI_DOC_INITING'))

Expand All @@ -222,11 +232,11 @@ function doc.runCLI()
if os.clock() - lastClock > 0.2 then
lastClock = os.clock()
local output = '\x0D'
.. ('>'):rep(math.ceil(i / max * 20))
.. ('='):rep(20 - math.ceil(i / max * 20))
.. ' '
.. ('0'):rep(#tostring(max) - #tostring(i))
.. tostring(i) .. '/' .. tostring(max)
.. ('>'):rep(math.ceil(i / max * 20))
.. ('='):rep(20 - math.ceil(i / max * 20))
.. ' '
.. ('0'):rep(#tostring(max) - #tostring(i))
.. tostring(i) .. '/' .. tostring(max)
io.write(output)
end
end)
Expand Down
4 changes: 2 additions & 2 deletions script/lclient.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ local defaultClientOptions = {
valueSet = {
define.DiagnosticTag.Unnecessary,
define.DiagnosticTag.Deprecated,
},
},
},
},
},
Expand All @@ -92,7 +92,7 @@ local defaultClientOptions = {
function mt:initialize(params)
local initParams = util.tableMerge(params or {}, defaultClientOptions)
self:awaitRequest('initialize', initParams)
self:notify('initialized')
self:notify('initialized', initParams)
end

function mt:reportHangs()
Expand Down
2 changes: 1 addition & 1 deletion script/provider/provider.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ m.register 'initialized'{
---@async
function (_params)
local _ <close> = progress.create(workspace.getFirstScope().uri, lang.script.WINDOW_INITIALIZING, 0.5)
m.updateConfig()
m.updateConfig((_params or {}).luarcParentUri)
local registrations = {}

if client.getAbility 'workspace.didChangeConfiguration.dynamicRegistration' then
Expand Down
Loading