From 6774e336bacb8a4506c54161cc7c78c301f8262f Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Tue, 12 Nov 2019 21:42:42 -0500
Subject: [PATCH] Deconflict dev mode block function names again (#3907)

Fixes #3900
---
 package-lock.json                             |  6 ++---
 package.json                                  |  2 +-
 src/compiler/compile/render_dom/Block.ts      | 22 +++++++++----------
 .../deconflict-block-methods/_config.js       |  6 +++++
 .../deconflict-block-methods/main.svelte      |  5 +++++
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 test/runtime/samples/deconflict-block-methods/_config.js
 create mode 100644 test/runtime/samples/deconflict-block-methods/main.svelte

diff --git a/package-lock.json b/package-lock.json
index c43ea8461bcc..208d392bfdf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -500,9 +500,9 @@
       "dev": true
     },
     "code-red": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.20.tgz",
-      "integrity": "sha512-nEh0GdiKVQ1zFyTImD+Z93kqVG0UPXSn9W5YCafOiOHBlVEhlVQkuVmerCg1CPmm1xka/3cvhS+EI/Ozeke6bQ==",
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.21.tgz",
+      "integrity": "sha512-luUVxyGNwTU/lG+lY+pitXHJzgDvFa0WfxA4Nsd7uk/S366mHY8B86pwAcyRcKY9BE/HvryVNXCR691Q5ry+Ww==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.0",
diff --git a/package.json b/package.json
index 8ad1cde1015c..d10edd1f1e09 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "acorn": "^7.1.0",
     "agadoo": "^1.1.0",
     "c8": "^5.0.1",
-    "code-red": "0.0.20",
+    "code-red": "0.0.21",
     "codecov": "^3.5.0",
     "css-tree": "1.0.0-alpha22",
     "eslint": "^6.3.0",
diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index 0b9784a6e8b1..74822ef9bed0 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -266,7 +266,7 @@ export default class Block {
 					: this.chunks.hydrate
 			);
 
-			properties.create = x`function create() {
+			properties.create = x`function #create() {
 				${this.chunks.create}
 				${hydrate}
 			}`;
@@ -276,7 +276,7 @@ export default class Block {
 			if (this.chunks.claim.length === 0 && this.chunks.hydrate.length === 0) {
 				properties.claim = noop;
 			} else {
-				properties.claim = x`function claim(#nodes) {
+				properties.claim = x`function #claim(#nodes) {
 					${this.chunks.claim}
 					${this.renderer.options.hydratable && this.chunks.hydrate.length > 0 && b`this.h();`}
 				}`;
@@ -284,7 +284,7 @@ export default class Block {
 		}
 
 		if (this.renderer.options.hydratable && this.chunks.hydrate.length > 0) {
-			properties.hydrate = x`function hydrate() {
+			properties.hydrate = x`function #hydrate() {
 				${this.chunks.hydrate}
 			}`;
 		}
@@ -292,7 +292,7 @@ export default class Block {
 		if (this.chunks.mount.length === 0) {
 			properties.mount = noop;
 		} else {
-			properties.mount = x`function mount(#target, anchor) {
+			properties.mount = x`function #mount(#target, anchor) {
 				${this.chunks.mount}
 			}`;
 		}
@@ -302,7 +302,7 @@ export default class Block {
 				properties.update = noop;
 			} else {
 				const ctx = this.maintain_context ? x`#new_ctx` : x`#ctx`;
-				properties.update = x`function update(#changed, ${ctx}) {
+				properties.update = x`function #update(#changed, ${ctx}) {
 					${this.maintain_context && b`#ctx = ${ctx};`}
 					${this.chunks.update}
 				}`;
@@ -310,15 +310,15 @@ export default class Block {
 		}
 
 		if (this.has_animation) {
-			properties.measure = x`function measure() {
+			properties.measure = x`function #measure() {
 				${this.chunks.measure}
 			}`;
 
-			properties.fix = x`function fix() {
+			properties.fix = x`function #fix() {
 				${this.chunks.fix}
 			}`;
 
-			properties.animate = x`function animate() {
+			properties.animate = x`function #animate() {
 				${this.chunks.animate}
 			}`;
 		}
@@ -327,7 +327,7 @@ export default class Block {
 			if (this.chunks.intro.length === 0) {
 				properties.intro = noop;
 			} else {
-				properties.intro = x`function intro(#local) {
+				properties.intro = x`function #intro(#local) {
 					${this.has_outros && b`if (#current) return;`}
 					${this.chunks.intro}
 				}`;
@@ -336,7 +336,7 @@ export default class Block {
 			if (this.chunks.outro.length === 0) {
 				properties.outro = noop;
 			} else {
-				properties.outro = x`function outro(#local) {
+				properties.outro = x`function #outro(#local) {
 					${this.chunks.outro}
 				}`;
 			}
@@ -345,7 +345,7 @@ export default class Block {
 		if (this.chunks.destroy.length === 0) {
 			properties.destroy = noop;
 		} else {
-			properties.destroy = x`function destroy(detaching) {
+			properties.destroy = x`function #destroy(detaching) {
 				${this.chunks.destroy}
 			}`;
 		}
diff --git a/test/runtime/samples/deconflict-block-methods/_config.js b/test/runtime/samples/deconflict-block-methods/_config.js
new file mode 100644
index 000000000000..2bb1aa84242e
--- /dev/null
+++ b/test/runtime/samples/deconflict-block-methods/_config.js
@@ -0,0 +1,6 @@
+export default {
+	compileOptions: {
+		dev: true
+	},
+	html: `<div>deconflicted</div>`
+};
diff --git a/test/runtime/samples/deconflict-block-methods/main.svelte b/test/runtime/samples/deconflict-block-methods/main.svelte
new file mode 100644
index 000000000000..ad7548887331
--- /dev/null
+++ b/test/runtime/samples/deconflict-block-methods/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	const create = 'deconflicted';
+</script>
+
+<div>{create}</div>