如果有 merge 属性，则跳过 duplicate-doc-alias 检查

Author: sumneko

script/core/diagnostics/duplicate-doc-alias.lua

@@ -15,6 +15,7 @@ return function (uri, callback)
         return
     end
 
+    local merged = {}
     local cache = {}
     for _, doc in ipairs(state.ast.docs) do
         if doc.type == 'doc.alias'
@@ -36,10 +37,11 @@ return function (uri, callback)
                             finish = otherDoc.finish,
                             uri    = guide.getUri(otherDoc),
                         }
+                        merged[name] = merged[name] or vm.docHasAttr(otherDoc, 'merge')
                     end
                 end
             end
-            if #cache[name] > 1 then
+            if not merged[name] and #cache[name] > 1 then
                 callback {
                     start   = (doc.alias or doc.enum).start,
                     finish  = (doc.alias or doc.enum).finish,

script/parser/luadoc.lua

@@ -1026,6 +1026,7 @@ local docSwitch = util.switch()
         local result = {
             type   = 'doc.alias',
         }
+        result.docAttr = parseDocAttr()
         result.alias = parseName('doc.alias.name', result)
         if not result.alias then
             pushWarning {

test/diagnostics/duplicate-doc-alias.lua

@@ -8,3 +8,14 @@ TEST [[
 ---@class B
 ---@alias <!A!> B
 ]]
+
+TEST [[
+---@alias A integer
+---@alias(merge) A integer
+
+---@enum B
+---@enum(merge) B
+
+---@enum(key) C
+---@enum(key, merge) C
+]]