simplify

Author: Rich-Harris

packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js

@@ -27,7 +27,7 @@ export function SnippetBlock(node, context) {
 	const can_hoist =
 		context.path.length === 1 &&
 		context.path[0].type === 'Fragment' &&
-		can_hoist_snippet(node, local_scope, context.state.scopes);
+		can_hoist_snippet(local_scope, context.state.scopes);
 	const undefined_exports = context.state.analysis.undefined_exports;
 	const name = node.expression.name;
 
@@ -78,15 +78,14 @@ export function SnippetBlock(node, context) {
 }
 
 /**
- * @param {AST.SnippetBlock} node
  * @param {Map<SvelteNode, Scope>} scopes
  * @param {Scope} scope
  */
-function can_hoist_snippet(node, scope, scopes, visited = new Set()) {
-	ref_loop: for (const [reference] of scope.references) {
+function can_hoist_snippet(scope, scopes, visited = new Set()) {
+	for (const [reference] of scope.references) {
 		const binding = scope.get(reference);
 
-		if (!binding || binding.node === node.expression || binding.scope.function_depth === 0) {
+		if (!binding || binding.scope.function_depth === 0) {
 			continue;
 		}
 
@@ -95,21 +94,12 @@ function can_hoist_snippet(node, scope, scopes, visited = new Set()) {
 			continue;
 		}
 
-		// Recursively check if another snippet can be hoisted
-		if (binding.kind === 'normal') {
-			for (const ref of binding.references) {
-				const parent = ref.path.at(-1);
-				if (ref.node === binding.node && parent?.type === 'SnippetBlock') {
-					const ref_scope = scopes.get(parent);
-					if (visited.has(ref)) {
-						break;
-					}
-					visited.add(ref);
-					if (ref_scope && can_hoist_snippet(parent, ref_scope, scopes, visited)) {
-						continue ref_loop;
-					}
-					break;
-				}
+		if (binding.initial?.type === 'SnippetBlock') {
+			if (visited.has(binding)) continue;
+			visited.add(binding);
+
+			if (can_hoist_snippet(binding.scope, scopes, visited)) {
+				continue;
 			}
 		}
 

packages/svelte/src/compiler/phases/scope.js

@@ -75,7 +75,7 @@ export class Scope {
 	 * @param {Identifier} node
 	 * @param {Binding['kind']} kind
 	 * @param {DeclarationKind} declaration_kind
-	 * @param {null | Expression | FunctionDeclaration | ClassDeclaration | ImportDeclaration | AST.EachBlock} initial
+	 * @param {null | Expression | FunctionDeclaration | ClassDeclaration | ImportDeclaration | AST.EachBlock | AST.SnippetBlock} initial
 	 * @returns {Binding}
 	 */
 	declare(node, kind, declaration_kind, initial = null) {
@@ -632,7 +632,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 			if (is_top_level) {
 				scope = /** @type {Scope} */ (parent);
 			}
-			scope.declare(node.expression, 'normal', 'function', node.expression);
+			scope.declare(node.expression, 'normal', 'function', node);
 
 			const child_scope = state.scope.child();
 			scopes.set(node, child_scope);

packages/svelte/src/compiler/types/index.d.ts

@@ -292,7 +292,8 @@ export interface Binding {
 		| FunctionDeclaration
 		| ClassDeclaration
 		| ImportDeclaration
-		| AST.EachBlock;
+		| AST.EachBlock
+		| AST.SnippetBlock;
 	is_called: boolean;
 	references: { node: Identifier; path: SvelteNode[] }[];
 	mutated: boolean;