diagnostic group

Author: sumneko

script/config/template.lua

@@ -239,6 +239,10 @@ local template = {
                                                     'Warning',
                                                     'Information',
                                                     'Hint',
+                                                    'Error!',
+                                                    'Warning!',
+                                                    'Information!',
+                                                    'Hint!',
                                                 }
                                             )
                                             >> util.deepCopy(define.DiagnosticDefaultSeverity),
@@ -248,6 +252,9 @@ local template = {
                                                     'Any',
                                                     'Opened',
                                                     'None',
+                                                    'Any!',
+                                                    'Opened!',
+                                                    'None!',
                                                 }
                                             )
                                             >> util.deepCopy(define.DiagnosticDefaultNeededFileStatus),
@@ -285,7 +292,6 @@ local template = {
                                                 'Opened',
                                                 'Disable',
                                             },
-    ['Lua.typeCheck.enable']                = Type.Boolean >> true,
     ['Lua.workspace.ignoreDir']             = Type.Array(Type.String) >> {
                                                 '.vscode',
                                             },

script/core/diagnostics/init.lua

@@ -4,6 +4,7 @@ local config = require 'config'
 local await  = require 'await'
 local vm     = require "vm.vm"
 local util   = require 'utility'
+local diagd  = require 'proto.diagnostic'
 
 -- 把耗时最长的诊断放到最后面
 local diagSort = {
@@ -50,6 +51,64 @@ local function checkSleep(uri, passed)
     sleepRest = sleepRest - sleeped
 end
 
+---@param uri  uri
+---@param name string
+---@return string
+local function getSeverity(uri, name)
+    local severity =   config.get(uri, 'Lua.diagnostics.severity')[name]
+                    or define.DiagnosticDefaultSeverity[name]
+    if severity:sub(-1) == '!' then
+        return severity:sub(1, -2)
+    end
+    local groupSeverity = config.get(uri, 'Lua.diagnostics.groupSeverity')
+    local groups = diagd.getGroups(name)
+    local groupLevel = 999
+    for _, groupName in ipairs(groups) do
+        local gseverity = groupSeverity[groupName]
+        if gseverity ~= 'Fallback' then
+            groupLevel = math.min(groupLevel, define.DiagnosticSeverity[gseverity])
+        end
+    end
+    if groupLevel == 999 then
+        return severity
+    end
+    for severityName, level in pairs(define.DiagnosticSeverity) do
+        if level == groupLevel then
+            return severityName
+        end
+    end
+    return severity
+end
+
+---@param uri  uri
+---@param name string
+---@return string
+local function getStatus(uri, name)
+    local status = config.get(uri, 'Lua.diagnostics.neededFileStatus')[name]
+                or define.DiagnosticDefaultNeededFileStatus[name]
+    if status:sub(-1) == '!' then
+        return status:sub(1, -2)
+    end
+    local groupStatus = config.get(uri, 'Lua.diagnostics.groupFileStatus')
+    local groups = diagd.getGroups(name)
+    local groupLevel = 0
+    for _, groupName in ipairs(groups) do
+        local gstatus = groupStatus[groupName]
+        if gstatus ~= 'Fallback' then
+            groupLevel = math.max(groupLevel, define.DiagnosticFileStatus[gstatus])
+        end
+    end
+    if groupLevel == 0 then
+        return status
+    end
+    for statusName, level in pairs(define.DiagnosticFileStatus) do
+        if level == groupLevel then
+            return statusName
+        end
+    end
+    return status
+end
+
 ---@async
 ---@param uri uri
 ---@param name string
@@ -60,21 +119,18 @@ local function check(uri, name, isScopeDiag, response)
     if util.arrayHas(disables, name) then
         return
     end
-    local level =  config.get(uri, 'Lua.diagnostics.severity')[name]
-                or define.DiagnosticDefaultSeverity[name]
-
-    local neededFileStatus =   config.get(uri, 'Lua.diagnostics.neededFileStatus')[name]
-                            or define.DiagnosticDefaultNeededFileStatus[name]
+    local severity = getSeverity(uri, name)
+    local status   = getStatus(uri, name)
 
-    if neededFileStatus == 'None' then
+    if status == 'None' then
         return
     end
 
-    if neededFileStatus == 'Opened' and not files.isOpen(uri) then
+    if status == 'Opened' and not files.isOpen(uri) then
         return
     end
 
-    local severity = define.DiagnosticSeverity[level]
+    local level = define.DiagnosticSeverity[severity]
     local clock = os.clock()
     local mark = {}
     ---@async
@@ -90,7 +146,7 @@ local function check(uri, name, isScopeDiag, response)
         end
         mark[result.start] = true
 
-        result.level = severity or result.level
+        result.level = level or result.level
         result.code  = name
         response(result)
     end, name)

script/proto/define.lua

@@ -10,6 +10,12 @@ m.DiagnosticSeverity = {
     Hint        = 4,
 }
 
+m.DiagnosticFileStatus = {
+    Any        = 1,
+    Opened     = 2,
+    None       = 3,
+}
+
 --- 诊断类型与默认等级
 m.DiagnosticDefaultSeverity = diag.getDefaultSeverity()
 

script/proto/diagnostic.lua

@@ -1,3 +1,5 @@
+local util = require 'utility'
+
 ---@class proto.diagnostic
 local m = {}
 
@@ -217,4 +219,17 @@ function m.getGroupStatus()
     return group
 end
 
+---@param name string
+---@return string[]
+m.getGroups = util.catchReturn(function (name)
+    local groups = {}
+    for groupName, nameMap in pairs(m.diagnosticGroups) do
+        if nameMap[name] then
+            groups[#groups+1] = groupName
+        end
+    end
+    table.sort(groups)
+    return groups
+end)
+
 return m

script/utility.lua

@@ -832,4 +832,17 @@ m.MODE_K  = { __mode = 'k' }
 m.MODE_V  = { __mode = 'v' }
 m.MODE_KV = { __mode = 'kv' }
 
+---@generic T: fun(param: any):any
+---@param func T
+---@return T
+function m.catchReturn(func)
+    local cache = {}
+    return function (param)
+        if cache[param] == nil then
+            cache[param] = func(param)
+        end
+        return cache[param]
+    end
+end
+
 return m