simplify

sveltejs · Rich-Harris · Feb 24, 2025 · Feb 20, 2025 · Feb 20, 2025 · Feb 20, 2025
commit 763ed356882ed4f4a6866cef10e297166a331c96
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -6,15 +6,12 @@ import {
 	update_effect,
 	get,
 	is_destroying_effect,
-	is_flushing_effect,
 	remove_reactions,
 	schedule_effect,
 	set_active_reaction,
 	set_is_destroying_effect,
-	set_is_flushing_effect,
 	set_signal_status,
 	untrack,
-	skip_reaction,
 	untracking
 } from '../runtime.js';
 import {
@@ -118,17 +115,12 @@ function create_effect(type, fn, sync, push = true) {
 	}
 
 	if (sync) {
-		var previously_flushing_effect = is_flushing_effect;
-
 		try {
-			set_is_flushing_effect(true);
 			update_effect(effect);
 			effect.f |= EFFECT_RAN;
 		} catch (e) {
 			destroy_effect(effect);
 			throw e;
-		} finally {
-			set_is_flushing_effect(previously_flushing_effect);
 		}
 	} else if (fn !== null) {
 		schedule_effect(effect);

diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -14,8 +14,6 @@ import {
 	derived_sources,
 	set_derived_sources,
 	check_dirtiness,
-	set_is_flushing_effect,
-	is_flushing_effect,
 	untracking
 } from '../runtime.js';
 import { equals, safe_equals } from './equality.js';
@@ -202,22 +200,18 @@ export function internal_set(source, value) {
 
 		if (DEV && inspect_effects.size > 0) {
 			const inspects = Array.from(inspect_effects);
-			var previously_flushing_effect = is_flushing_effect;
-			set_is_flushing_effect(true);
-			try {
-				for (const effect of inspects) {
-					// Mark clean inspect-effects as maybe dirty and then check their dirtiness
-					// instead of just updating the effects - this way we avoid overfiring.
-					if ((effect.f & CLEAN) !== 0) {
-						set_signal_status(effect, MAYBE_DIRTY);
-					}
-					if (check_dirtiness(effect)) {
-						update_effect(effect);
-					}
+
+			for (const effect of inspects) {
+				// Mark clean inspect-effects as maybe dirty and then check their dirtiness
+				// instead of just updating the effects - this way we avoid overfiring.
+				if ((effect.f & CLEAN) !== 0) {
+					set_signal_status(effect, MAYBE_DIRTY);
+				}
+				if (check_dirtiness(effect)) {
+					update_effect(effect);
 				}
-			} finally {
-				set_is_flushing_effect(previously_flushing_effect);
 			}
+
 			inspect_effects.clear();
 		}
 	}

diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
@@ -53,11 +53,6 @@ let last_scheduled_effect = null;
 export let is_flushing_effect = false; // TODO do we still need this?
 export let is_destroying_effect = false;
 
-/** @param {boolean} value */
-export function set_is_flushing_effect(value) {
-	is_flushing_effect = value;
-}
-
 /** @param {boolean} value */
 export function set_is_destroying_effect(value) {
 	is_destroying_effect = value;
@@ -552,8 +547,10 @@ export function update_effect(effect) {
 
 	var previous_effect = active_effect;
 	var previous_component_context = component_context;
+	var previously_flushing_effect = is_flushing_effect;
 
 	active_effect = effect;
+	is_flushing_effect = true;
 
 	if (DEV) {
 		var previous_component_fn = dev_current_component_function;
@@ -595,6 +592,7 @@ export function update_effect(effect) {
 	} catch (error) {
 		handle_error(error, effect, previous_effect, previous_component_context || effect.ctx);
 	} finally {
+		is_flushing_effect = previously_flushing_effect;
 		active_effect = previous_effect;
 
 		if (DEV) {
@@ -646,9 +644,6 @@ function infinite_loop_guard() {
 }
 
 function flush_queued_root_effects() {
-	var previously_flushing_effect = is_flushing_effect;
-	is_flushing_effect = true;
-
 	try {
 		var flush_count = 0;
 
@@ -674,7 +669,6 @@ function flush_queued_root_effects() {
 			}
 		}
 	} finally {
-		is_flushing_effect = previously_flushing_effect;
 		is_flushing = false;
 
 		last_scheduled_effect = null;