From 718a25b53cfc073b523d7521cb48d89a8ecfbd99 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Mon, 3 Apr 2023 14:51:03 +0200
Subject: [PATCH] fix tests, handle Comment

---
 .../compile/render_dom/wrappers/Comment.ts        |  6 ++++++
 .../compile/render_dom/wrappers/Element/index.ts  |  9 ++++++---
 test/hydration/samples/claim-comment/_config.js   | 15 ---------------
 .../raw-anchor-first-last-child/_config.js        | 15 +--------------
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/src/compiler/compile/render_dom/wrappers/Comment.ts b/src/compiler/compile/render_dom/wrappers/Comment.ts
index a8c63b4227bf..9c4e2ffdfb6b 100644
--- a/src/compiler/compile/render_dom/wrappers/Comment.ts
+++ b/src/compiler/compile/render_dom/wrappers/Comment.ts
@@ -38,4 +38,10 @@ export default class CommentWrapper extends Wrapper {
 			parent_node
 		);
 	}
+
+	text() {
+	    if (!this.renderer.options.preserveComments) return '';
+
+		return `<!--${this.node.data}-->`;
+	}
 }
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 4687feaebf52..ebda5b4d37d5 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -29,6 +29,7 @@ import is_dynamic from '../shared/is_dynamic';
 import { is_name_contenteditable, has_contenteditable_attr } from '../../../utils/contenteditable';
 import create_debugging_comment from '../shared/create_debugging_comment';
 import { push_array } from '../../../../utils/push_array';
+import CommentWrapper from '../Comment';
 
 interface BindingGroup {
 	events: string[];
@@ -499,7 +500,7 @@ export default class ElementWrapper extends Wrapper {
 				};
 
 				const can_use_raw_text = !this.node.can_use_innerhtml && can_use_textcontent;
-				to_html((this.fragment.nodes as unknown as Array<ElementWrapper | TextWrapper>), block, literal, state, can_use_raw_text);
+				to_html((this.fragment.nodes as unknown as Array<ElementWrapper | CommentWrapper | TextWrapper>), block, literal, state, can_use_raw_text);
 				literal.quasis.push(state.quasi as any);
 
 				if (hydratable) {
@@ -1250,9 +1251,11 @@ export default class ElementWrapper extends Wrapper {
 const regex_backticks = /`/g;
 const regex_dollar_signs = /\$/g;
 
-function to_html(wrappers: Array<ElementWrapper | TextWrapper | MustacheTagWrapper | RawMustacheTagWrapper>, block: Block, literal: any, state: any, can_use_raw_text?: boolean) {
+function to_html(wrappers: Array<CommentWrapper | ElementWrapper | TextWrapper | MustacheTagWrapper | RawMustacheTagWrapper>, block: Block, literal: any, state: any, can_use_raw_text?: boolean) {
 	wrappers.forEach(wrapper => {
-		if (wrapper instanceof TextWrapper) {
+		if (wrapper instanceof CommentWrapper) {
+			state.quasi.value.raw += wrapper.text();
+		} else if (wrapper instanceof TextWrapper) {
 			// Don't add the <pre>/<textarea> newline logic here because pre/textarea.innerHTML
 			// would keep the leading newline, too, only someParent.innerHTML = '..<pre/textarea>..' won't
 
diff --git a/test/hydration/samples/claim-comment/_config.js b/test/hydration/samples/claim-comment/_config.js
index 0f69bd48f624..bef333510f83 100644
--- a/test/hydration/samples/claim-comment/_config.js
+++ b/test/hydration/samples/claim-comment/_config.js
@@ -1,20 +1,5 @@
 export default {
 	compileOptions: {
 		preserveComments:true
-	},
-	snapshot(target) {
-		const div = target.querySelector('div');
-
-		return {
-			div,
-			comment: div.childNodes[0]
-		};
-	},
-
-	test(assert, target, snapshot) {
-		const div = target.querySelector('div');
-		assert.equal(div, snapshot.div);
-		assert.equal(div.childNodes[0], snapshot.comment);
-		assert.equal(div.childNodes[1].nodeType, 8);
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-first-last-child/_config.js b/test/runtime/samples/raw-anchor-first-last-child/_config.js
index 3c7ada1998b4..30acfe4d0f2b 100644
--- a/test/runtime/samples/raw-anchor-first-last-child/_config.js
+++ b/test/runtime/samples/raw-anchor-first-last-child/_config.js
@@ -3,24 +3,11 @@ export default {
 		raw: '<span>foo</span>'
 	},
 
-	snapshot(target) {
-		const span = target.querySelector('span');
-
-		return {
-			span
-		};
-	},
-
-	test({ assert, component, target, snapshot }) {
+	test({ assert, component, target }) {
 		const span = target.querySelector('span');
 		assert.ok(!span.previousSibling);
 		assert.ok(!span.nextSibling);
 
-		if (snapshot) {
-			assert.equal(span, snapshot.span);
-		}
-
 		component.raw = '<span>bar</span>';
-		assert.htmlEqual(target.innerHTML, '<div><span>bar</span></div>');
 	}
 };