Add globalsRegex to diagnostics

Improve checkIsUndefinedGlobal to avoid unecessary checks and tables

4 files changed, 84 insertions, 8 deletions

diff --git a/script/config/template.lua b/script/config/template.lua
index 49907419..e74a9f9c 100644
--- a/script/config/template.lua
+++ b/script/config/template.lua
@@ -242,6 +242,7 @@ local template = {
                                             >> util.deepCopy(define.BuiltIn),
     ['Lua.diagnostics.enable']              = Type.Boolean >> true,
     ['Lua.diagnostics.globals']             = Type.Array(Type.String),
+    ['Lua.diagnostics.globalsRegex']        = Type.Array(Type.String),
     ['Lua.diagnostics.disable']             = Type.Array(Type.String << util.getTableKeys(diag.getDiagAndErrNameMap(), true)),
     ['Lua.diagnostics.severity']            = Type.Hash(
                                                 Type.String << util.getTableKeys(define.DiagnosticDefaultNeededFileStatus, true),
diff --git a/script/core/diagnostics/global-element.lua b/script/core/diagnostics/global-element.lua
index e9dd46ce..a30ebbc6 100644
--- a/script/core/diagnostics/global-element.lua
+++ b/script/core/diagnostics/global-element.lua
@@ -17,6 +17,20 @@ local function isDocClass(source)
     return false
 end
 
+local function isGlobalRegex(name, definedGlobalRegex)
+    if not definedGlobalRegex then
+        return false
+    end
+
+    for _, pattern in ipairs(definedGlobalRegex) do
+        if name:match(pattern) then
+            return true
+        end
+    end
+
+    return false
+end
+
 -- If global elements are discouraged by coding convention, this diagnostic helps with reminding about that
 -- Exceptions may be added to Lua.diagnostics.globals
 return function (uri, callback)
@@ -26,6 +40,7 @@ return function (uri, callback)
     end
 
     local definedGlobal = util.arrayToHash(config.get(uri, 'Lua.diagnostics.globals'))
+    local definedGlobalRegex = config.get(uri, 'Lua.diagnostics.globalsRegex')
 
     guide.eachSourceType(ast.ast, 'setglobal', function (source)
         local name = guide.getKeyName(source)
@@ -36,6 +51,9 @@ return function (uri, callback)
         if isDocClass(source) then
             return
         end
+        if isGlobalRegex(name, definedGlobalRegex) then
+            return
+        end
         if definedGlobal[name] == nil then
             definedGlobal[name] = false
             local global = vm.getGlobal('variable', name)
diff --git a/script/core/diagnostics/lowercase-global.lua b/script/core/diagnostics/lowercase-global.lua
index 68bec234..c7e9294d 100644
--- a/script/core/diagnostics/lowercase-global.lua
+++ b/script/core/diagnostics/lowercase-global.lua
@@ -17,6 +17,20 @@ local function isDocClass(source)
     return false
 end
 
+local function isGlobalRegex(name, definedGlobalRegex)
+    if not definedGlobalRegex then
+        return false
+    end
+
+    for _, pattern in ipairs(definedGlobalRegex) do
+        if name:match(pattern) then
+            return true
+        end
+    end
+
+    return false
+end
+
 -- 不允许定义首字母小写的全局变量（很可能是拼错或者漏删）
 return function (uri, callback)
     local ast = files.getState(uri)
@@ -25,6 +39,7 @@ return function (uri, callback)
     end
 
     local definedGlobal = util.arrayToHash(config.get(uri, 'Lua.diagnostics.globals'))
+    local definedGlobalRegex = config.get(uri, 'Lua.diagnostics.globalsRegex')
 
     guide.eachSourceType(ast.ast, 'setglobal', function (source)
         local name = guide.getKeyName(source)
@@ -42,6 +57,9 @@ return function (uri, callback)
         if isDocClass(source) then
             return
         end
+        if isGlobalRegex(name, definedGlobalRegex) then
+            return
+        end
         if definedGlobal[name] == nil then
             definedGlobal[name] = false
             local global = vm.getGlobal('variable', name)
diff --git a/script/vm/global.lua b/script/vm/global.lua
index e830f6d8..aa987cf4 100644
--- a/script/vm/global.lua
+++ b/script/vm/global.lua
@@ -539,21 +539,60 @@ function vm.hasGlobalSets(suri, cate, name)
     return true
 end
 
+---@param uri uri
+---@param key string
+---@return boolean
+local function checkIsGlobalRegex(uri, key)
+    local dglobalsregex = config.get(uri, 'Lua.diagnostics.globalsRegex')
+    if not dglobalsregex then
+        return false
+    end
+
+    for _, pattern in ipairs(dglobalsregex) do
+        if key:match(pattern) then
+            return true
+        end
+    end
+
+    return false
+end
+
 ---@param src parser.object
 local function checkIsUndefinedGlobal(src)
+    if src.type ~= 'getglobal' then
+        return false
+    end
+
     local key = src[1]
+    if not key then
+        return false
+    end
+
+    local node = src.node
+    if node.tag ~= '_ENV' then
+        return false
+    end
 
     local uri = guide.getUri(src)
-    local dglobals = util.arrayToHash(config.get(uri, 'Lua.diagnostics.globals'))
     local rspecial = config.get(uri, 'Lua.runtime.special')
+    if rspecial[key] then
+        return false
+    end
 
-    local node = src.node
-    return src.type == 'getglobal' and key and not (
-        dglobals[key] or
-        rspecial[key] or
-        node.tag ~= '_ENV' or
-        vm.hasGlobalSets(uri, 'variable', key)
-    )
+    if vm.hasGlobalSets(uri, 'variable', key) then
+        return false
+    end
+
+    local dglobals = config.get(uri, 'Lua.diagnostics.globals')
+    if util.arrayHas(dglobals, key) then
+        return false
+    end
+
+    if checkIsGlobalRegex(uri, key) then
+        return false
+    end
+
+    return true
 end
 
 ---@param src parser.object