diff --git a/.changeset/empty-files-prove.md b/.changeset/empty-files-prove.md
new file mode 100644
index 000000000000..03ea2f70a547
--- /dev/null
+++ b/.changeset/empty-files-prove.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: robustify migration script around indentation and comments
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index 44546408d87f..1baf7eb6cc63 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -322,7 +322,10 @@ const instance_script = {
 				state.str.prependLeft(/** @type {number} */ (declarator.init.start), '$state(');
 				state.str.appendRight(/** @type {number} */ (declarator.init.end), ')');
 			} else {
-				state.str.prependLeft(/** @type {number} */ (declarator.id.end), ' = $state()');
+				state.str.prependLeft(
+					/** @type {number} */ (declarator.id.typeAnnotation?.end ?? declarator.id.end),
+					' = $state()'
+				);
 			}
 		}
 
@@ -587,13 +590,13 @@ function extract_type_and_comment(declarator, str, path) {
 }
 
 /**
- * @param {import('#compiler').RegularElement | import('#compiler').SvelteElement | import('#compiler').SvelteWindow | import('#compiler').SvelteDocument | import('#compiler').SvelteBody} node
+ * @param {import('#compiler').RegularElement | import('#compiler').SvelteElement | import('#compiler').SvelteWindow | import('#compiler').SvelteDocument | import('#compiler').SvelteBody} element
  * @param {State} state
  */
-function handle_events(node, state) {
+function handle_events(element, state) {
 	/** @type {Map<string, import('#compiler').OnDirective[]>} */
 	const handlers = new Map();
-	for (const attribute of node.attributes) {
+	for (const attribute of element.attributes) {
 		if (attribute.type !== 'OnDirective') continue;
 
 		let name = `on${attribute.name}`;
@@ -625,6 +628,7 @@ function handle_events(node, state) {
 
 		for (let i = 0; i < nodes.length - 1; i += 1) {
 			const node = nodes[i];
+			const indent = get_indent(state, node, element);
 			if (node.expression) {
 				let body = '';
 				if (node.expression.type === 'ArrowFunctionExpression') {
@@ -638,19 +642,20 @@ function handle_events(node, state) {
 						/** @type {number} */ (node.expression.end)
 					)}();`;
 				}
-				// TODO check how many indents needed
+
 				for (const modifier of node.modifiers) {
 					if (modifier === 'stopPropagation') {
-						body = `\n${state.indent}${payload_name}.stopPropagation();\n${body}`;
+						body = `\n${indent}${payload_name}.stopPropagation();\n${body}`;
 					} else if (modifier === 'preventDefault') {
-						body = `\n${state.indent}${payload_name}.preventDefault();\n${body}`;
+						body = `\n${indent}${payload_name}.preventDefault();\n${body}`;
 					} else if (modifier === 'stopImmediatePropagation') {
-						body = `\n${state.indent}${payload_name}.stopImmediatePropagation();\n${body}`;
+						body = `\n${indent}${payload_name}.stopImmediatePropagation();\n${body}`;
 					} else {
-						body = `\n${state.indent}// @migration-task: incorporate ${modifier} modifier\n${body}`;
+						body = `\n${indent}// @migration-task: incorporate ${modifier} modifier\n${body}`;
 					}
 				}
-				prepend += `\n${state.indent}${body}\n`;
+
+				prepend += `\n${indent}${body}\n`;
 			} else {
 				if (!local) {
 					local = state.scope.generate(`on${node.name}`);
@@ -663,7 +668,7 @@ function handle_events(node, state) {
 						type: '(event: any) => void'
 					});
 				}
-				prepend += `\n${state.indent}${local}?.(${payload_name});\n`;
+				prepend += `\n${indent}${local}?.(${payload_name});\n`;
 			}
 
 			state.str.remove(node.start, node.end);
@@ -683,15 +688,17 @@ function handle_events(node, state) {
 				state.str.appendRight(last.start + last.name.length + 3, 'capture');
 			}
 
+			const indent = get_indent(state, last, element);
+
 			for (const modifier of last.modifiers) {
 				if (modifier === 'stopPropagation') {
-					prepend += `\n${state.indent}${payload_name}.stopPropagation();\n`;
+					prepend += `\n${indent}${payload_name}.stopPropagation();\n`;
 				} else if (modifier === 'preventDefault') {
-					prepend += `\n${state.indent}${payload_name}.preventDefault();\n`;
+					prepend += `\n${indent}${payload_name}.preventDefault();\n`;
 				} else if (modifier === 'stopImmediatePropagation') {
-					prepend += `\n${state.indent}${payload_name}.stopImmediatePropagation();\n`;
+					prepend += `\n${indent}${payload_name}.stopImmediatePropagation();\n`;
 				} else if (modifier !== 'capture') {
-					prepend += `\n${state.indent}// @migration-task: incorporate ${modifier} modifier\n`;
+					prepend += `\n${indent}// @migration-task: incorporate ${modifier} modifier\n`;
 				}
 			}
 
@@ -723,17 +730,20 @@ function handle_events(node, state) {
 					pos = /** @type {number} */ (pos) + (needs_curlies ? 0 : 1);
 					if (needs_curlies && state.str.original[pos - 1] === '(') {
 						// Prettier does something like on:click={() => (foo = true)}, we need to remove the braces in this case
-						state.str.update(pos - 1, pos, `{${prepend}${state.indent}`);
-						state.str.update(end, end + 1, '\n}');
+						state.str.update(pos - 1, pos, `{${prepend}${indent}`);
+						state.str.update(end, end + 1, `\n${indent.slice(state.indent.length)}}`);
 					} else {
-						state.str.prependRight(pos, `${needs_curlies ? '{' : ''}${prepend}${state.indent}`);
-						state.str.appendRight(end, `\n${needs_curlies ? '}' : ''}`);
+						state.str.prependRight(pos, `${needs_curlies ? '{' : ''}${prepend}${indent}`);
+						state.str.appendRight(
+							end,
+							`\n${indent.slice(state.indent.length)}${needs_curlies ? '}' : ''}`
+						);
 					}
 				} else {
 					state.str.update(
 						/** @type {number} */ (last.expression.start),
 						/** @type {number} */ (last.expression.end),
-						`(${payload_name}) => {${prepend}\n${state.indent}${state.str.original.substring(
+						`(${payload_name}) => {${prepend}\n${indent}${state.str.original.substring(
 							/** @type {number} */ (last.expression.start),
 							/** @type {number} */ (last.expression.end)
 						)}?.(${payload_name});\n}`
@@ -771,6 +781,29 @@ function handle_events(node, state) {
 	}
 }
 
+/**
+ * Returns the next indentation level of the first node that has all-whitespace before it
+ * @param {State} state
+ * @param {Array<{start: number; end: number}>} nodes
+ */
+function get_indent(state, ...nodes) {
+	let indent = state.indent;
+
+	for (const node of nodes) {
+		const line_start = state.str.original.lastIndexOf('\n', node.start);
+		indent = state.str.original.substring(line_start + 1, node.start);
+
+		if (indent.trim() === '') {
+			indent = state.indent + indent;
+			return indent;
+		} else {
+			indent = state.indent;
+		}
+	}
+
+	return indent;
+}
+
 /**
  * @param {import('#compiler').OnDirective} last
  * @param {State} state
diff --git a/packages/svelte/src/compiler/phases/1-parse/acorn.js b/packages/svelte/src/compiler/phases/1-parse/acorn.js
index 0da21fe3ce92..432fa8f92077 100644
--- a/packages/svelte/src/compiler/phases/1-parse/acorn.js
+++ b/packages/svelte/src/compiler/phases/1-parse/acorn.js
@@ -138,7 +138,10 @@ function amend(source, node) {
 				}
 			}
 
-			if (/** @type {any} */ (node).typeAnnotation && node.end === undefined) {
+			if (
+				/** @type {any} */ (node).typeAnnotation &&
+				(node.end === undefined || node.end < node.start)
+			) {
 				// i think there might be a bug in acorn-typescript that prevents
 				// `end` from being assigned when there's a type annotation
 				let end = /** @type {any} */ (node).typeAnnotation.start;
diff --git a/packages/svelte/tests/migrate/samples/event-handlers/input.svelte b/packages/svelte/tests/migrate/samples/event-handlers/input.svelte
index 888e0e9d0546..2557062727e3 100644
--- a/packages/svelte/tests/migrate/samples/event-handlers/input.svelte
+++ b/packages/svelte/tests/migrate/samples/event-handlers/input.svelte
@@ -18,3 +18,17 @@
 <button on:click|self={() => ''}>click me</button>
 
 <Button on:click={() => 'leave untouched'} on:click>click me</Button>
+
+<div>
+	<button
+		on:click={() => {
+			console.log('hi');
+		}}>click me</button
+	>
+	<button
+		on:click|preventDefault={() => {
+			console.log('hi');
+		}}>click me</button
+	>
+	<button on:click|preventDefault={() => (count += 1)}>click me</button>
+</div>
diff --git a/packages/svelte/tests/migrate/samples/event-handlers/output.svelte b/packages/svelte/tests/migrate/samples/event-handlers/output.svelte
index c58da6052626..a424a686bc26 100644
--- a/packages/svelte/tests/migrate/samples/event-handlers/output.svelte
+++ b/packages/svelte/tests/migrate/samples/event-handlers/output.svelte
@@ -50,4 +50,24 @@
 	''
 }}>click me</button>
 
-<Button on:click={() => 'leave untouched'} on:click>click me</Button>
\ No newline at end of file
+<Button on:click={() => 'leave untouched'} on:click>click me</Button>
+
+<div>
+	<button
+		onclick={() => {
+			console.log('hi');
+		}}>click me</button
+	>
+	<button
+		onclick={(event) => {
+			event.preventDefault();
+			
+			console.log('hi');
+		
+		}}>click me</button
+	>
+	<button onclick={(event) => {
+		event.preventDefault();
+		count += 1
+	}}>click me</button>
+</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/state-ts/input.svelte b/packages/svelte/tests/migrate/samples/state-ts/input.svelte
new file mode 100644
index 000000000000..ec6593a6b0e7
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/state-ts/input.svelte
@@ -0,0 +1,8 @@
+<script lang="ts">
+	// here is a comment
+	let div: HTMLIFrameElement;
+	let count = 0;
+</script>
+
+<div bind:this={div}></div>
+<button on:click={() => count++}>{count}</button>
diff --git a/packages/svelte/tests/migrate/samples/state-ts/output.svelte b/packages/svelte/tests/migrate/samples/state-ts/output.svelte
new file mode 100644
index 000000000000..c6f672c5358f
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/state-ts/output.svelte
@@ -0,0 +1,8 @@
+<script lang="ts">
+	// here is a comment
+	let div: HTMLIFrameElement = $state();
+	let count = $state(0);
+</script>
+
+<div bind:this={div}></div>
+<button onclick={() => count++}>{count}</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index b0305d709b87..5051d9ba4da1 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -76,7 +76,7 @@
 							"id": {
 								"type": "Identifier",
 								"start": 52,
-								"end": 18,
+								"end": 57,
 								"loc": {
 									"start": {
 										"line": 3,
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
index c3442092a8af..117496744bdc 100644
--- 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
@@ -155,7 +155,7 @@
 												"id": {
 													"type": "Identifier",
 													"start": 102,
-													"end": 20,
+													"end": 106,
 													"loc": {
 														"start": {
 															"line": 7,