hakowork/charm
3
0
Fork 0
mirror of https://github.com/littensy/charm.git synced 2026-10-20 17:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: effectScope should set scope

Browse source
This commit is contained in:
littensy 2025-05-03 21:16:53 -07:00
parent e34b0c9aca
commit a0fc88ede1
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/charm/src/signals.luau
View file

@ -324,9 +324,9 @@ local function effectScope(fn: () -> ...() -> ()?): () -> ()
if activeScope then if activeScope then
link(e, activeScope) link(e, activeScope)
end end
local prev = setCurrentSub(e) local prev = setCurrentScope(e)
local success, result = pcall(fn) local success, result = pcall(fn)
setCurrentSub(prev) setCurrentScope(prev)
if not success then if not success then
error(result) error(result)
end end

6
tests/signals/effectScope.spec.luau
View file

@ -44,7 +44,7 @@ test("should run effect cleanup", function()
assert(cleanups == 1, "should skip redundant cleanup") assert(cleanups == 1, "should skip redundant cleanup")
end) end)
test("should not run indirect effect cleanup", function() test("should run indirect effect cleanup", function()
local cleanups = 0 local cleanups = 0
local cleanup local cleanup
@ -58,9 +58,9 @@ test("should not run indirect effect cleanup", function()
assert(cleanups == 0, "should not cleanup immediately") assert(cleanups == 0, "should not cleanup immediately")
stopScope() stopScope()
assert(cleanups == 0, "should be detached from parent dispose") assert(cleanups == 1, "should cleanup from parent dispose")
cleanup() cleanup()
assert(cleanups == 1, "should cleanup after inner dispose") assert(cleanups == 1, "should skip redundant dispose")
end) end)
return {} return {}