Merge branch 'master' into unittest-support-test-specify-unit

andrewbraxton · Jan 2, 2025 · ddf2788 · ddf2788
2 parents 5b360d5 + fc21ee4
commit ddf2788
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,7 @@
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `NEW` Test CLI: `--name=<testname>` `-n=<testname>`: run specify unit test
+* `FIX` Fixed the error that the configuration file pointed to by the `--configpath` option was not read and loaded.
 
 ## 3.13.5
 `2024-12-20`

diff --git a/script/cli/doc/init.lua b/script/cli/doc/init.lua
@@ -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
@@ -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
@@ -193,6 +193,15 @@ function doc.runCLI()
 
     print('root uri = ' .. rootUri)
 
+    --- If '--configpath' is specified, get the folder path of the '.luarc.doc.json' configuration file (without the file name)
+    --- 如果指定了'--configpath'，则获取`.luarc.doc.json` 配置文件的文件夹路径(不包含文件名）
+    --- 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()
@@ -203,6 +212,7 @@ function doc.runCLI()
 
         client:initialize {
             rootUri = rootUri,
+            luarcParentUri = luarcParentUri,
         }
         io.write(lang.script('CLI_DOC_INITING'))
 
@@ -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)

diff --git a/script/lclient.lua b/script/lclient.lua
@@ -77,7 +77,7 @@ local defaultClientOptions = {
                         valueSet = {
                             define.DiagnosticTag.Unnecessary,
                             define.DiagnosticTag.Deprecated,
-                         },
+                        },
                     },
                 },
             },
@@ -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()

diff --git a/script/provider/provider.lua b/script/provider/provider.lua
@@ -139,9 +139,10 @@ m.register 'initialize' {
 
 m.register 'initialized'{
     ---@async
-    function (_params)
+    function (params)
         local _ <close> = progress.create(workspace.getFirstScope().uri, lang.script.WINDOW_INITIALIZING, 0.5)
-        m.updateConfig()
+        --- 传递`.luarc.doc.json`文件所在的文件夹路径
+        m.updateConfig(params and params.luarcParentUri)
         local registrations = {}
 
         if client.getAbility 'workspace.didChangeConfiguration.dynamicRegistration' then