add missing end AST property to non-top-level <style> tags (sveltejs#…

…5487)
taylorzane · Dec 17, 2020 · 2f91899 · 2f91899
1 parent 3ba8ed1
commit 2f91899
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
@@ -223,21 +223,14 @@ export default function tag(parser: Parser) {
 		);
 		parser.read(/<\/textarea>/);
 		element.end = parser.index;
-	} else if (name === 'script') {
+	} else if (name === 'script' || name === 'style') {
 		// special case
 		const start = parser.index;
-		const data = parser.read_until(/<\/script>/);
+		const data = parser.read_until(new RegExp(`</${name}>`));
 		const end = parser.index;
 		element.children.push({ start, end, type: 'Text', data });
-		parser.eat('</script>', true);
+		parser.eat(`</${name}>`, true);
 		element.end = parser.index;
-	} else if (name === 'style') {
-		// special case
-		const start = parser.index;
-		const data = parser.read_until(/<\/style>/);
-		const end = parser.index;
-		element.children.push({ start, end, type: 'Text', data });
-		parser.eat('</style>', true);
 	} else {
 		parser.stack.push(element);
 	}

diff --git a/test/parser/samples/style-inside-head/input.svelte b/test/parser/samples/style-inside-head/input.svelte
@@ -0,0 +1 @@
+<svelte:head><style></style></svelte:head>
diff --git a/test/parser/samples/style-inside-head/output.json b/test/parser/samples/style-inside-head/output.json
@@ -0,0 +1,33 @@
+{
+	"html": {
+		"start": 0,
+		"end": 42,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 42,
+				"type": "Head",
+				"name": "svelte:head",
+				"attributes": [],
+				"children": [
+					{
+						"start": 13,
+						"end": 28,
+						"type": "Element",
+						"name": "style",
+						"attributes": [],
+						"children": [
+							{
+								"start": 20,
+								"end": 20,
+								"type": "Text",
+								"data": ""
+							}
+						]
+					}
+				]
+			}
+		]
+	}
+}