fix: correctly handle unclosed tags with same type tag inside (#2682)

paoloricciuti · web-flow · commit e284968b4d84 · 2025-03-06T12:43:52.000+01:00
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts
@@ -225,11 +225,19 @@ export class Element {
                 ...this.startEndTransformation
             ]);
 
+            const closingTag = this.str.original.substring(
+                this.str.original.lastIndexOf('</', this.node.end - 1) + 2,
+                this.node.end - 1
+            );
+
             const tagEndIdx = this.str.original
                 .substring(this.node.start, this.node.end)
                 .lastIndexOf(`</${this.node.name}`);
             // tagEndIdx === -1 happens in situations of unclosed tags like `<p>fooo <p>anothertag</p>`
-            const endStart = tagEndIdx === -1 ? this.node.end : tagEndIdx + this.node.start;
+            const endStart =
+                tagEndIdx === -1 || closingTag.trim() !== this.node.name
+                    ? this.node.end
+                    : tagEndIdx + this.node.start;
             transform(this.str, endStart, this.node.end, this.endTransformation);
         }
     }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expected.error.json
@@ -0,0 +1,16 @@
+{
+    "code": "unclosed-element",
+    "start": {
+        "line": 1,
+        "column": 0,
+        "character": 0
+    },
+    "end": {
+        "line": 1,
+        "column": 1,
+        "character": 1
+    },
+    "pos": 0,
+    "frame": "1: <div>\n   ^\n2:   <i></i>\n3:   <div></div>",
+    "name": "ParseError"
+}
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expectedv2.ts
@@ -0,0 +1,10 @@
+///<reference types="svelte" />
+;function $$render() {
+async () => { { svelteHTML.createElement("div", {});
+	 { svelteHTML.createElement("p", {}); }
+	
+	 { svelteHTML.createElement("div", {}); }}};
+return { props: /** @type {Record<string, never>} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }}
+const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render())));
+/*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType<typeof Input__SvelteComponent_>;
+/*Ωignore_endΩ*/export default Input__SvelteComponent_;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/input.svelte
@@ -0,0 +1,4 @@
+<div>
+	<p></p>
+	
+	<div></div>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<div>
 +	<p></p>
++
 +	<div></div>