Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: type narrow on fields with multiple literals #2871

Merged
merged 1 commit into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions script/vm/tracer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ end
--- @param source parser.object
--- @param fieldName string
--- @param literal parser.object
--- @return string[]?
--- @return [string, boolean][]?
local function getNodeTypesWithLiteralField(uri, source, fieldName, literal)
local loc = vm.getVariable(source)
if not loc then
Expand All @@ -279,7 +279,7 @@ local function getNodeTypesWithLiteralField(uri, source, fieldName, literal)
for _, t in ipairs(f.extends.types) do
if t[1] == literal[1] then
tys = tys or {}
table.insert(tys, set.class[1])
table.insert(tys, {set.class[1], #f.extends.types > 1})
break
end
end
Expand Down Expand Up @@ -682,15 +682,19 @@ local lookIntoChild = util.switch()

-- TODO: handle more types
if tys and #tys == 1 then
local ty = tys[1]
-- If the type is in a union (e.g. 'lit' | foo), then the type
-- cannot be removed from the node.
local ty, tyInUnion = tys[1][1], tys[1][2]
topNode = topNode:copy()
if action.op.type == '==' then
topNode:narrow(tracer.uri, ty)
if outNode then
if not tyInUnion and outNode then
outNode:remove(ty)
end
else
topNode:remove(ty)
if not tyInUnion then
topNode:remove(ty)
end
if outNode then
outNode:narrow(tracer.uri, ty)
end
Expand Down
42 changes: 42 additions & 0 deletions test/type_inference/common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4529,3 +4529,45 @@ if obj.type == 'a' then
local <?r?> = obj
end
]]

TEST 'A|B' [[
--- @class A
--- @field mode? 'a' | 'b'

--- @class B

local a --- @type A | B

if a.mode == 'a' then
local b = a
else
local <?b?> = a
end
]]

TEST 'A|B' [[
--- @class A
--- @field mode? 'a' | 'b'

--- @class B

local a --- @type A | B

if a.mode ~= 'a' then
local <?b?> = a
end
]]

TEST 'A' [[
--- @class A
--- @field mode? 'a' | 'b'

--- @class B

local a --- @type A | B

if a.mode ~= 'a' then
else
local <?b?> = a
end
]]
Loading