take renames into account when migrating warnings

Author: dummdidumm

packages/svelte/scripts/process-messages/templates/compile-warnings.js

@@ -66,6 +66,15 @@ const legacy_codes = new Map([
 	['reactive_declaration_invalid_placement', 'non-top-level-reactive-declaration']
 ]);
 
+const new_codes = new Map([...legacy_codes.entries()].map(([key, value]) => [value, key]));
+
+/**
+ * @param {string} legacy_code
+ */
+export function legacy_to_new_code(legacy_code) {
+	return new_codes.get(legacy_code) || legacy_code.replaceAll('-', '_');
+}
+
 /**
  * @param {null | NodeLike} node
  * @param {string} code

packages/svelte/src/compiler/migrate/index.js

@@ -4,7 +4,7 @@ import { parse } from '../phases/1-parse/index.js';
 import { analyze_component } from '../phases/2-analyze/index.js';
 import { validate_component_options } from '../validate-options.js';
 import { get_rune } from '../phases/scope.js';
-import { reset_warnings } from '../warnings.js';
+import { legacy_to_new_code, reset_warnings } from '../warnings.js';
 import { extract_identifiers } from '../utils/ast.js';
 import { regex_is_valid_identifier } from '../phases/patterns.js';
 import { extract_svelte_ignore } from '../utils/extract_svelte_ignore.js';
@@ -180,13 +180,20 @@ const instance_script = {
 		const comments = node.leadingComments;
 		if (comments) {
 			for (const comment of comments) {
-				if (comment.type === 'Line' && extract_svelte_ignore(comment.value).length > 0) {
-					const svelte_ignore = comment.value.indexOf('svelte-ignore');
-					state.str.overwrite(
-						comment.start + svelte_ignore + 13 + '//'.length,
-						comment.end,
-						comment.value.substring(svelte_ignore + 13).replaceAll('-', '_')
-					);
+				if (comment.type === 'Line') {
+					/** @type {string} */
+					const text = comment.value;
+					const ignores = extract_svelte_ignore(text);
+					if (ignores.length > 0) {
+						const svelte_ignore = text.indexOf('svelte-ignore');
+						state.str.overwrite(
+							comment.start + svelte_ignore + 13 + '//'.length,
+							comment.end,
+							text
+								.substring(svelte_ignore + 13)
+								.replace(new RegExp(ignores.join('|'), 'g'), (match) => legacy_to_new_code(match))
+						);
+					}
 				}
 			}
 		}
@@ -494,12 +501,15 @@ const template = {
 		}
 	},
 	Comment(node, { state }) {
-		if (extract_svelte_ignore(node.data).length > 0) {
+		const ignores = extract_svelte_ignore(node.data);
+		if (ignores.length > 0) {
 			const svelte_ignore = node.data.indexOf('svelte-ignore');
 			state.str.overwrite(
 				node.start + svelte_ignore + 13 + '<!--'.length,
 				node.end - '-->'.length,
-				node.data.substring(svelte_ignore + 13).replaceAll('-', '_')
+				node.data
+					.substring(svelte_ignore + 13)
+					.replace(new RegExp(ignores.join('|'), 'g'), (match) => legacy_to_new_code(match))
 			);
 		}
 	}

packages/svelte/src/compiler/warnings.js

@@ -68,6 +68,15 @@ const legacy_codes = new Map([
 	]
 ]);
 
+const new_codes = new Map([...legacy_codes.entries()].map(([key, value]) => [value, key]));
+
+/**
+ * @param {string} legacy_code
+ */
+export function legacy_to_new_code(legacy_code) {
+	return new_codes.get(legacy_code) || legacy_code.replaceAll('-', '_');
+}
+
 /**
  * @param {null | NodeLike} node
  * @param {string} code

packages/svelte/tests/migrate/samples/svelte-ignore/input.svelte

@@ -1,6 +1,8 @@
 <script>
-	// svelte-ignore bla-bla
-	let x;
+	function foo() {
+		// svelte-ignore non-top-level-reactive-declaration
+		$: x = 1;
+	}
 </script>
 
 <!-- svelte-ignore a11y-something-something -->

packages/svelte/tests/migrate/samples/svelte-ignore/output.svelte

@@ -1,6 +1,8 @@
 <script>
-	// svelte-ignore bla_bla
-	let x;
+	function foo() {
+		// svelte-ignore reactive_declaration_invalid_placement
+		$: x = 1;
+	}
 </script>
 
 <!-- svelte-ignore a11y_something_something -->