merge 改叫 partial

LuaLS · Apr 18, 2024 · e1e7926 · e1e7926
1 parent 3767771
commit e1e7926
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,11 @@
 # changelog
 
 ## 3.7.5
-* `NEW` alias and enums supports attribute `merge`
+* `NEW` alias and enums supports attribute `partial`
   ```lua
   ---@alias Animal Cat
 
-  ---@alias(merge) Animal Dog
+  ---@alias(partial) Animal Dog
 
   ---@type Animal
   local animal --> animal is `Cat|Dog` here
@@ -19,7 +19,7 @@
       FATAL = 2,
   }
 
-  ---@enum(key, merge) ErrorCodes
+  ---@enum(key, partial) ErrorCodes
   local codes2 = {
       WARN = 3,
       INFO = 4,

diff --git a/script/core/diagnostics/duplicate-doc-alias.lua b/script/core/diagnostics/duplicate-doc-alias.lua
@@ -37,7 +37,7 @@ return function (uri, callback)
                             finish = otherDoc.finish,
                             uri    = guide.getUri(otherDoc),
                         }
-                        merged[name] = merged[name] or vm.docHasAttr(otherDoc, 'merge')
+                        merged[name] = merged[name] or vm.docHasAttr(otherDoc, 'partial')
                     end
                 end
             end

diff --git a/test/diagnostics/duplicate-doc-alias.lua b/test/diagnostics/duplicate-doc-alias.lua
@@ -11,11 +11,11 @@ TEST [[
 
 TEST [[
 ---@alias A integer
----@alias(merge) A integer
+---@alias(partial) A integer
 
 ---@enum B
----@enum(merge) B
+---@enum(partial) B
 
 ---@enum(key) C
----@enum(key, merge) C
+---@enum(key, partial) C
 ]]
diff --git a/test/type_inference/init.lua b/test/type_inference/init.lua
@@ -4338,7 +4338,7 @@ local <?x?> = f()
 
 TEST 'boolean|number' [[
 ---@alias A number
----@alias(merge) A boolean
+---@alias(partial) A boolean
 
 ---@type A
 local <?x?>