escape @ sigils in dev tooling events (sveltejs#3545)

Conduitry · Sep 10, 2019 · 88adfb6 · 88adfb6
1 parent c250793
commit 88adfb6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
@@ -2,7 +2,7 @@ import CodeBuilder from '../utils/CodeBuilder';
 import deindent from '../utils/deindent';
 import Renderer from './Renderer';
 import Wrapper from './wrappers/shared/Wrapper';
-import { escape } from '../utils/stringify';
+import { stringify, escape } from '../utils/stringify';
 
 export interface BlockOptions {
 	parent?: Block;
@@ -378,7 +378,7 @@ export default class Block {
 					const block = {
 						${properties}
 					};
-					@dispatch_dev("SvelteRegisterBlock", { block, id: ${this.name || 'create_fragment'}.name, type: "${this.type}", source: "${this.comment ? this.comment.replace(/"/g, '\\"') : ''}", ctx });
+					@dispatch_dev("SvelteRegisterBlock", { block, id: ${this.name || 'create_fragment'}.name, type: "${this.type}", source: ${stringify(this.comment || '', { only_escape_at_symbol: true })}, ctx });
 					return block;`
 				: deindent`
 					return {

diff --git a/...s/sigil-component-attribute/Widget.svelte → ...amples/sigil-component-prop/Widget.svelte b/...s/sigil-component-attribute/Widget.svelte → ...amples/sigil-component-prop/Widget.svelte
diff --git a/...ples/sigil-component-attribute/_config.js → ...e/samples/sigil-component-prop/_config.js b/...ples/sigil-component-attribute/_config.js → ...e/samples/sigil-component-prop/_config.js
@@ -1,4 +1,7 @@
 export default {
+	compileOptions: {
+		dev: true
+	},
 	props: { foo: 'foo' },
 	html: `<div>foo @ foo # foo</div>`,
 };
diff --git a/...les/sigil-component-attribute/main.svelte → .../samples/sigil-component-prop/main.svelte b/...les/sigil-component-attribute/main.svelte → .../samples/sigil-component-prop/main.svelte
@@ -3,4 +3,5 @@
 	export let foo;
 </script>
 
-<Widget value='foo @ {foo} # foo'/>
+<Widget value='foo @ {foo} # foo'>
+</Widget>