Merge pull request #725 from sveltejs/gh-722

unescape `#` character
sveltejs · Jul 28, 2017 · f550035 · f550035
2 parents e2980a8 + b701bf2
commit f550035
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
@@ -269,8 +269,9 @@ export default function dom(
 
 	let result = builder
 		.toString()
-		.replace(/(\\\\)?@(\w*)/g, (match: string, escaped: string, name: string) => {
+		.replace(/(\\\\)?([@#])(\w*)/g, (match: string, escaped: string, sigil: string, name: string) => {
 			if (escaped) return match.slice(2);
+			if (sigil !== '@') return match;
 
 			if (name in shared) {
 				if (options.dev && `${name}Dev` in shared) name = `${name}Dev`;

diff --git a/test/runtime/samples/css/Widget.html b/test/runtime/samples/css/Widget.html
@@ -2,6 +2,6 @@
 
 <style>
 	p {
-		color: red;
+		color: #f00;
 	}
 </style>
diff --git a/test/runtime/samples/css/_config.js b/test/runtime/samples/css/_config.js
@@ -3,6 +3,6 @@ export default {
 		const [ control, test ] = target.querySelectorAll( 'p' );
 
 		assert.equal( window.getComputedStyle( control ).color, '' );
-		assert.equal( window.getComputedStyle( test ).color, 'red' );
+		assert.equal( window.getComputedStyle( test ).color, 'rgb(255, 0, 0)' );
 	}
 };