From 936adcc0064936d0d34a1c39047604daa937844a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 20 Mar 2024 17:18:49 -0400
Subject: [PATCH] simplify

---
 .../src/internal/client/dom/blocks/await.js   | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js
index 304fe7086e..9ac11c3f60 100644
--- a/packages/svelte/src/internal/client/dom/blocks/await.js
+++ b/packages/svelte/src/internal/client/dom/blocks/await.js
@@ -10,7 +10,7 @@ import {
 	set_current_reaction
 } from '../../runtime.js';
 import { destroy_effect, pause_effect, render_effect } from '../../reactivity/effects.js';
-import { INERT } from '../../constants.js';
+import { DESTROYED, INERT } from '../../constants.js';
 
 /** @returns {import('../../types.js').AwaitBlock} */
 export function create_await_block() {
@@ -83,11 +83,11 @@ export function await_block(anchor_node, get_input, pending_fn, then_fn, catch_f
 		return effect;
 	}
 
-	/**
-	 * @param {import('#client').Effect} effect
-	 * @param {any} block
-	 */
-	function pause(effect, block) {
+	/** @param {import('#client').Effect} effect */
+	function pause(effect) {
+		if ((effect.f & DESTROYED) !== 0) return;
+		const block = effect.block;
+
 		pause_effect(effect, () => {
 			// TODO make this unnecessary
 			const dom = block?.d;
@@ -110,21 +110,13 @@ export function await_block(anchor_node, get_input, pending_fn, then_fn, catch_f
 				pending_effect = render_effect(() => pending_fn(anchor_node), (pending_block = {}), true);
 			}
 
-			if (then_effect) {
-				pause(then_effect, then_block);
-			}
-
-			if (catch_effect) {
-				pause(catch_effect, catch_block);
-			}
+			if (then_effect) pause(then_effect);
+			if (catch_effect) pause(catch_effect);
 
 			promise.then(
 				(value) => {
 					if (promise !== input) return;
-
-					if (pending_effect) {
-						pause(pending_effect, pending_block);
-					}
+					if (pending_effect) pause(pending_effect);
 
 					if (then_fn) {
 						then_effect = create_effect(then_fn, value, (then_block = {}));
@@ -132,10 +124,7 @@ export function await_block(anchor_node, get_input, pending_fn, then_fn, catch_f
 				},
 				(error) => {
 					if (promise !== input) return;
-
-					if (pending_effect) {
-						pause(pending_effect, pending_block);
-					}
+					if (pending_effect) pause(pending_effect);
 
 					if (catch_fn) {
 						catch_effect = create_effect(catch_fn, error, (catch_block = {}));
@@ -143,9 +132,8 @@ export function await_block(anchor_node, get_input, pending_fn, then_fn, catch_f
 				}
 			);
 		} else {
-			if (pending_effect) {
-				pause(pending_effect, pending_block);
-			}
+			if (pending_effect) pause(pending_effect);
+			if (catch_effect) pause(catch_effect);
 
 			if (then_effect) {
 				destroy_effect(then_effect);
@@ -155,10 +143,6 @@ export function await_block(anchor_node, get_input, pending_fn, then_fn, catch_f
 			if (then_fn) {
 				then_effect = render_effect(() => then_fn(anchor_node, input), (then_block = {}), true);
 			}
-
-			if (catch_effect) {
-				pause(catch_effect, catch_block);
-			}
 		}
 	}, block);