Merge branch 'LuaLS:master' into master

CppCXY · web-flow · commit 888bb1a17170 · 2023-02-16T11:02:52.000+08:00
diff --git a/3rd/bee.lua b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit 3720ee171729e3b327038e1b102c2002636076fd
+Subproject commit 3089fa1f51bb71254647b0c34a1159180049e621
diff --git a/3rd/luamake b/3rd/luamake
@@ -1 +1 @@
-Subproject commit 5e74765c88ad45d424e693ab412ea1a448592a86
+Subproject commit ca304a1c40c5d1a44841135ba11770bcce91a918
diff --git a/changelog.md b/changelog.md
@@ -1,16 +1,19 @@
 # changelog
 
 ## 3.6.11
+`2023-2-13`
 * `CHG` completion: don't show loading process
 * `FIX` [#1886]
 * `FIX` [#1887]
 * `FIX` [#1889]
 * `FIX` [#1895]
+* `FIX` [#1902]
 
 [#1886]: https://github.com/LuaLS/lua-language-server/issues/1886
 [#1887]: https://github.com/LuaLS/lua-language-server/issues/1887
 [#1889]: https://github.com/LuaLS/lua-language-server/issues/1889
 [#1895]: https://github.com/LuaLS/lua-language-server/issues/1895
+[#1902]: https://github.com/LuaLS/lua-language-server/issues/1902
 
 ## 3.6.10
 `2023-2-7`
diff --git a/doc/en-us/config.md b/doc/en-us/config.md
@@ -2161,22 +2161,6 @@ integer
 500
 ```
 
-# workspace.supportScheme
-
-Provide language server for the Lua files of the following scheme.
-
-## type
-
-```ts
-Array<string>
-```
-
-## default
-
-```jsonc
-["file","untitled","git"]
-```
-
 # workspace.useGitIgnore
 
 Ignore files list in `.gitignore` .
@@ -2207,4 +2191,4 @@ Array<string>
 
 ```jsonc
 []
-```
+```
diff --git a/doc/pt-br/config.md b/doc/pt-br/config.md
@@ -698,7 +698,7 @@ object<string, string>
 ```jsonc
 {
     /*
-    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1`
+    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1` 
     */
     "ambiguity-1": "Any",
     /*
@@ -946,7 +946,7 @@ object<string, string>
 ```jsonc
 {
     /*
-    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1`
+    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1` 
     */
     "ambiguity-1": "Warning",
     /*
@@ -2161,22 +2161,6 @@ integer
 500
 ```
 
-# workspace.supportScheme
-
-Provide language server for the Lua files of the following scheme.
-
-## type
-
-```ts
-Array<string>
-```
-
-## default
-
-```jsonc
-["file","untitled","git"]
-```
-
 # workspace.useGitIgnore
 
 Ignore files list in `.gitignore` .
@@ -2207,4 +2191,4 @@ Array<string>
 
 ```jsonc
 []
-```
+```
diff --git a/doc/zh-cn/config.md b/doc/zh-cn/config.md
@@ -698,7 +698,7 @@ object<string, string>
 ```jsonc
 {
     /*
-    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1`
+    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1` 
     */
     "ambiguity-1": "Any",
     /*
@@ -945,7 +945,7 @@ object<string, string>
 ```jsonc
 {
     /*
-    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1`
+    优先级歧义，如：`num or 0 + 1`，推测用户的实际期望为 `(num or 0) + 1` 
     */
     "ambiguity-1": "Warning",
     /*
@@ -2160,22 +2160,6 @@ integer
 500
 ```
 
-# workspace.supportScheme
-
-为以下 scheme 的lua文件提供语言服务。
-
-## type
-
-```ts
-Array<string>
-```
-
-## default
-
-```jsonc
-["file","untitled","git"]
-```
-
 # workspace.useGitIgnore
 
 忽略 `.gitignore` 中列举的文件。
@@ -2206,4 +2190,4 @@ Array<string>
 
 ```jsonc
 []
-```
+```
diff --git a/doc/zh-tw/config.md b/doc/zh-tw/config.md
@@ -2160,22 +2160,6 @@ integer
 500
 ```
 
-# workspace.supportScheme
-
-為以下 `scheme` 的lua檔案提供語言伺服。
-
-## type
-
-```ts
-Array<string>
-```
-
-## default
-
-```jsonc
-["file","untitled","git"]
-```
-
 # workspace.useGitIgnore
 
 忽略 `.gitignore` 中列舉的檔案。
@@ -2206,4 +2190,4 @@ Array<string>
 
 ```jsonc
 []
-```
+```
diff --git a/make.lua b/make.lua
@@ -4,6 +4,17 @@ lm.bindir = "bin"
 lm.c = lm.compiler == 'msvc' and 'c89' or 'c11'
 lm.cxx = 'c++17'
 
+if lm.sanitize then
+    lm.mode = "debug"
+    lm.flags = "-fsanitize=address"
+    lm.gcc = {
+        ldflags = "-fsanitize=address"
+    }
+    lm.clang = {
+        ldflags = "-fsanitize=address"
+    }
+end
+
 ---@diagnostic disable-next-line: codestyle-check
 lm.EXE_DIR = ""
 
@@ -79,23 +90,24 @@ end
 local platform = require 'bee.platform'
 local exe      = platform.OS == 'Windows' and ".exe" or ""
 
-lm:build "bee-test" {
-    lm.bindir .. "/lua-language-server" .. exe, "3rd/bee.lua/test/test.lua",
+lm:rule "runtest" {
+    lm.bindir .. "/lua-language-server" .. exe, "$in",
+    description = "Run test: $in.",
     pool = "console",
-    deps = {
-        "all",
-    }
+}
+
+lm:build "bee-test" {
+    rule = "runtest",
+    deps = { "all" },
+    input = "3rd/bee.lua/test/test.lua",
 }
 
 lm:build 'unit-test' {
-    lm.bindir .. "/lua-language-server" .. exe, 'test.lua',
-    pool = "console",
-    deps = {
-        "bee-test",
-    }
+    rule = "runtest",
+    deps = { "bee-test", "all" },
+    input = "test.lua",
 }
 
 lm:default {
-    "bee-test",
     "unit-test",
 }
diff --git a/script/cli/doc.lua b/script/cli/doc.lua
@@ -310,8 +310,8 @@ function export.runCLI()
     local mdPath = doc2md.buildMD(LOGPATH)
 
     print(lang.script('CLI_DOC_DONE'
-        , ('[%s](%s)'):format(ws.normalize(docPath), furi.encode(docPath))
-        , ('[%s](%s)'):format(ws.normalize(mdPath),  furi.encode(mdPath))
+        , ('[%s](%s)'):format(files.normalize(docPath), furi.encode(docPath))
+        , ('[%s](%s)'):format(files.normalize(mdPath),  furi.encode(mdPath))
     ))
 end
 
diff --git a/script/core/command/exportDocument.lua b/script/core/command/exportDocument.lua
@@ -3,13 +3,14 @@ local client = require 'client'
 local furi   = require 'file-uri'
 local lang   = require 'language'
 local ws     = require 'workspace'
+local files  = require 'files'
 
 ---@async
 return function (args)
     local outputPath = args[1] and furi.decode(args[1]) or LOGPATH
     local docPath, mdPath = doc.makeDoc(outputPath)
     client.showMessage('Info', lang.script('CLI_DOC_DONE'
-        , ('[%s](%s)'):format(ws.normalize(docPath), furi.encode(docPath))
-        , ('[%s](%s)'):format(ws.normalize(mdPath),  furi.encode(mdPath))
+        , ('[%s](%s)'):format(files.normalize(docPath), furi.encode(docPath))
+        , ('[%s](%s)'):format(files.normalize(mdPath),  furi.encode(mdPath))
     ))
 end
diff --git a/script/files.lua b/script/files.lua
@@ -887,6 +887,41 @@ function m.countStates()
     return n
 end
 
+---@param path string
+---@return string
+function m.normalize(path)
+    path = path:gsub('%$%{(.-)%}', function (key)
+        if key == '3rd' then
+            return (ROOT / 'meta' / '3rd'):string()
+        end
+        if key:sub(1, 4) == 'env:' then
+            local env = os.getenv(key:sub(5))
+            return env
+        end
+    end)
+    path = util.expandPath(path)
+    path = path:gsub('^%.[/\\]+', '')
+    for _ = 1, 1000 do
+        if path:sub(1, 2) == '..' then
+            break
+        end
+        local count
+        path, count = path:gsub('[^/\\]+[/\\]+%.%.[/\\]', '/', 1)
+        if count == 0 then
+            break
+        end
+    end
+    if platform.OS == 'Windows' then
+        path = path:gsub('[/\\]+', '\\')
+                   :gsub('[/\\]+$', '')
+                   :gsub('^(%a:)$', '%1\\')
+    else
+        path = path:gsub('[/\\]+', '/')
+                   :gsub('[/\\]+$', '')
+    end
+    return path
+end
+
 --- 注册事件
 ---@param callback async fun(ev: string, uri: uri)
 function m.watch(callback)
diff --git a/script/filewatch.lua b/script/filewatch.lua
@@ -2,6 +2,7 @@ local fw    = require 'bee.filewatch'
 local fs    = require 'bee.filesystem'
 local plat  = require 'bee.platform'
 local await = require 'await'
+local files = require 'files'
 
 local MODIFY = 1 << 0
 local RENAME = 1 << 1
@@ -93,6 +94,7 @@ function m.update()
             if not ev then
                 break
             end
+            path = files.normalize(path)
             log.debug('filewatch:', ev, path)
             if not collect then
                 collect = {}
diff --git a/script/vm/infer.lua b/script/vm/infer.lua
@@ -243,6 +243,16 @@ local viewNodeSwitch;viewNodeSwitch = util.switch()
 ---@class vm.node
 ---@field lastInfer? vm.infer
 
+---@param node? vm.node
+---@return vm.infer
+local function createInfer(node)
+    local infer = setmetatable({
+        node  = node,
+        _drop = {},
+    }, mt)
+    return infer
+end
+
 ---@param source vm.node.object | vm.node
 ---@return vm.infer
 function vm.getInfer(source)
@@ -258,10 +268,7 @@ function vm.getInfer(source)
     if node.lastInfer then
         return node.lastInfer
     end
-    local infer = setmetatable({
-        node  = node,
-        _drop = {},
-    }, mt)
+    local infer = createInfer(node)
     node.lastInfer = infer
 
     return infer
@@ -311,9 +318,7 @@ function mt:_eraseAlias(uri)
                 if set.type == 'doc.alias' then
                     if expandAlias then
                         self._drop[n.name] = true
-                        local newInfer = setmetatable({
-                            _drop = {},
-                        }, mt)
+                        local newInfer = createInfer()
                         for _, ext in ipairs(set.extends.types) do
                             viewNodeSwitch(ext.type, ext, newInfer, uri)
                         end
@@ -322,7 +327,7 @@ function mt:_eraseAlias(uri)
                         end
                     else
                         for _, ext in ipairs(set.extends.types) do
-                            local view = viewNodeSwitch(ext.type, ext, {}, uri)
+                            local view = viewNodeSwitch(ext.type, ext, createInfer(), uri)
                             if view and view ~= n.name then
                                 self._drop[view] = true
                             end
@@ -546,9 +551,7 @@ end
 ---@param uri uri
 ---@return string?
 function vm.viewObject(source, uri)
-    local infer = setmetatable({
-        _drop = {},
-    }, mt)
+    local infer = createInfer()
     return viewNodeSwitch(source.type, source, infer, uri)
 end
 
diff --git a/script/vm/tracer.lua b/script/vm/tracer.lua
@@ -641,7 +641,8 @@ local lookIntoChild = util.switch()
             and    handler.args[1]
             and    tracer.getMap[handler.args[1]] then
                 -- if type(x) == 'string' then
-                tracer:lookIntoChild(handler, topNode:copy())
+                tracer:lookIntoChild(handler, topNode)
+                topNode = topNode:copy()
                 if action.op.type == '==' then
                     topNode:narrow(tracer.uri, checker[1])
                     if outNode then
diff --git a/script/workspace/require-path.lua b/script/workspace/require-path.lua
diff --git a/script/workspace/workspace.lua b/script/workspace/workspace.lua
diff --git a/test/diagnostics/type-check.lua b/test/diagnostics/type-check.lua
diff --git a/tools/configuration.lua b/tools/configuration.lua
