summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/diagnostics/duplicate-doc-alias.lua6
-rw-r--r--test/type_inference/init.lua2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/diagnostics/duplicate-doc-alias.lua b/test/diagnostics/duplicate-doc-alias.lua
index 5a208e3e..e518ffc6 100644
--- 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
index 093cfb1e..da4590a6 100644
--- 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?>