fix bug

trueadm · trueadm · commit bdf3a1aafaa3 · 2024-12-10T10:16:12.000Z
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js
@@ -99,8 +99,9 @@ function can_hoist_snippet(scope, scopes, visited = new Set()) {
 		if (binding.initial?.type === 'SnippetBlock') {
 			if (visited.has(binding)) continue;
 			visited.add(binding);
+			const snippet_scope = /** @type {Scope} */ (scopes.get(binding.initial));
 
-			if (can_hoist_snippet(binding.scope, scopes, visited)) {
+			if (can_hoist_snippet(snippet_scope, scopes, visited)) {
 				continue;
 			}
 		}
diff --git a/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json b/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
@@ -15,16 +15,16 @@
 						"end": 20,
 						"type": "Action",
 						"name": "autofocus",
-						"modifiers": [],
-						"expression": null
+						"expression": null,
+						"modifiers": []
 					},
 					{
 						"start": 21,
 						"end": 34,
 						"type": "Action",
 						"name": "autofocus",
-						"modifiers": [],
-						"expression": null
+						"expression": null,
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
@@ -15,7 +15,6 @@
 						"end": 39,
 						"type": "Action",
 						"name": "tooltip",
-						"modifiers": [],
 						"expression": {
 							"type": "CallExpression",
 							"start": 21,
@@ -66,7 +65,8 @@
 								}
 							],
 							"optional": false
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
@@ -15,7 +15,6 @@
 						"end": 28,
 						"type": "Action",
 						"name": "tooltip",
-						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
 							"start": 20,
@@ -31,7 +30,8 @@
 								}
 							},
 							"name": "message"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
@@ -15,7 +15,6 @@
 						"end": 36,
 						"type": "Action",
 						"name": "tooltip",
-						"modifiers": [],
 						"expression": {
 							"type": "Literal",
 							"start": 21,
@@ -32,7 +31,8 @@
 							},
 							"value": "tooltip msg",
 							"raw": "'tooltip msg'"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/action/output.json b/packages/svelte/tests/parser-legacy/samples/action/output.json
@@ -15,8 +15,8 @@
 						"end": 20,
 						"type": "Action",
 						"name": "autofocus",
-						"modifiers": [],
-						"expression": null
+						"expression": null,
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/animation/output.json b/packages/svelte/tests/parser-legacy/samples/animation/output.json
@@ -20,8 +20,8 @@
 								"end": 50,
 								"type": "Animation",
 								"name": "flip",
-								"modifiers": [],
-								"expression": null
+								"expression": null,
+								"modifiers": []
 							}
 						],
 						"children": [
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
@@ -15,7 +15,6 @@
 						"end": 22,
 						"type": "Class",
 						"name": "foo",
-						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
 							"start": 16,
@@ -31,7 +30,8 @@
 								}
 							},
 							"name": "isFoo"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
@@ -15,7 +15,6 @@
 						"end": 23,
 						"type": "EventHandler",
 						"name": "click",
-						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
 							"start": 19,
@@ -31,7 +30,8 @@
 								}
 							},
 							"name": "foo"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": [
diff --git a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
@@ -22,13 +22,13 @@
 						"end": 46,
 						"type": "Binding",
 						"name": "foo",
-						"modifiers": [],
 						"expression": {
 							"start": 43,
 							"end": 46,
 							"type": "Identifier",
 							"name": "foo"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/binding/output.json b/packages/svelte/tests/parser-legacy/samples/binding/output.json
@@ -22,7 +22,6 @@
 						"end": 55,
 						"type": "Binding",
 						"name": "value",
-						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
 							"start": 50,
@@ -38,7 +37,8 @@
 								}
 							},
 							"name": "name"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/event-handler/output.json b/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
@@ -15,7 +15,6 @@
 						"end": 45,
 						"type": "EventHandler",
 						"name": "click",
-						"modifiers": [],
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 19,
@@ -100,7 +99,8 @@
 									}
 								}
 							}
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": [
diff --git a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
@@ -22,7 +22,6 @@
 						"end": 692,
 						"type": "EventHandler",
 						"name": "click",
-						"modifiers": [],
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 596,
@@ -137,7 +136,8 @@
 									"end": 594
 								}
 							]
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": [
diff --git a/packages/svelte/tests/parser-legacy/samples/refs/output.json b/packages/svelte/tests/parser-legacy/samples/refs/output.json
@@ -22,7 +22,6 @@
 						"end": 53,
 						"type": "Binding",
 						"name": "this",
-						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
 							"start": 49,
@@ -38,7 +37,8 @@
 								}
 							},
 							"name": "foo"
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"children": []
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
@@ -15,8 +15,8 @@
 						"end": 12,
 						"type": "Transition",
 						"name": "fade",
-						"modifiers": [],
 						"expression": null,
+						"modifiers": [],
 						"intro": true,
 						"outro": false
 					}
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
@@ -15,7 +15,6 @@
 						"end": 30,
 						"type": "Transition",
 						"name": "style",
-						"modifiers": [],
 						"expression": {
 							"type": "ObjectExpression",
 							"start": 16,
@@ -85,6 +84,7 @@
 								}
 							]
 						},
+						"modifiers": [],
 						"intro": true,
 						"outro": false
 					}
diff --git a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
@@ -25,7 +25,6 @@
 						"end": 147,
 						"type": "OnDirective",
 						"name": "click",
-						"modifiers": [],
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 73,
@@ -316,7 +315,8 @@
 									}
 								]
 							}
-						}
+						},
+						"modifiers": []
 					}
 				],
 				"fragment": {
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-3/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-3/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: '<h1>Hello world!</h1>'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-3/main.svelte
@@ -0,0 +1,13 @@
+<script module>
+	export { foo }
+</script>
+
+<script>
+	let name = 'world';
+</script>
+
+<h1>Hello {name}!</h1>
+
+{#snippet foo()}
+	oo
+{/snippet}
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
@@ -2,17 +2,17 @@ import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 import TextInput from './Child.svelte';
 
-var root = $.template(`<!> `, 1);
+const snippet = ($$anchor) => {
+	$.next();
 
-export default function Bind_component_snippet($$anchor) {
-	const snippet = ($$anchor) => {
-		$.next();
+	var text = $.text("Something");
 
-		var text = $.text("Something");
+	$.append($$anchor, text);
+};
 
-		$.append($$anchor, text);
-	};
+var root = $.template(`<!> `, 1);
 
+export default function Bind_component_snippet($$anchor) {
 	let value = $.state('');
 	const _snippet = snippet;
 	var fragment = root();
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -1,14 +1,13 @@
 import * as $ from "svelte/internal/server";
 import TextInput from './Child.svelte';
 
+function snippet($$payload) {
+	$$payload.out += `<!---->Something`;
+}
+
 export default function Bind_component_snippet($$payload) {
 	let value = '';
 	const _snippet = snippet;
-
-	function snippet($$payload) {
-		$$payload.out += `<!---->Something`;
-	}
-
 	let $$settled = true;
 	let $$inner_payload;
 

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,9 @@ function can_hoist_snippet(scope, scopes, visited = new Set()) {`
`99`	`99`	`if (binding.initial?.type === 'SnippetBlock') {`
`100`	`100`	`if (visited.has(binding)) continue;`
`101`	`101`	`visited.add(binding);`
	`102`	`+ const snippet_scope = /** @type {Scope} */ (scopes.get(binding.initial));`
`102`	`103`
`103`		`- if (can_hoist_snippet(binding.scope, scopes, visited)) {`
	`104`	`+ if (can_hoist_snippet(snippet_scope, scopes, visited)) {`
`104`	`105`	`continue;`
`105`	`106`	`}`
`106`	`107`	`}`