From 170f4210bc099836588882062a2a4c4a5fd807c7 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Wed, 23 Nov 2016 12:35:34 -0500
Subject: [PATCH] refactor slightly

---
 compiler/generate/visitors/EachBlock.js               |  3 +--
 compiler/generate/visitors/IfBlock.js                 |  4 +---
 compiler/generate/visitors/MustacheTag.js             |  3 +--
 .../visitors/attributes/addComponentAttributes.js     |  4 ++--
 .../visitors/attributes/addElementAttributes.js       | 11 +++++------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/compiler/generate/visitors/EachBlock.js b/compiler/generate/visitors/EachBlock.js
index 412641a101..8ade6b53a8 100644
--- a/compiler/generate/visitors/EachBlock.js
+++ b/compiler/generate/visitors/EachBlock.js
@@ -18,8 +18,7 @@ export default {
 
 		generator.addSourcemapLocations( node.expression );
 
-		const { dependencies } = generator.contextualise( node.expression );
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
+		const { dependencies, snippet } = generator.contextualise( node.expression );
 
 		generator.current.updateStatements.push( deindent`
 			var ${name}_value = ${snippet};
diff --git a/compiler/generate/visitors/IfBlock.js b/compiler/generate/visitors/IfBlock.js
index 51be1d3fc6..e2ec51c9b2 100644
--- a/compiler/generate/visitors/IfBlock.js
+++ b/compiler/generate/visitors/IfBlock.js
@@ -17,9 +17,7 @@ export default {
 		` );
 
 		generator.addSourcemapLocations( node.expression );
-		generator.contextualise( node.expression );
-
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
+		const { snippet } = generator.contextualise( node.expression );
 
 		const ifTrue = [ deindent`
 			if ( !${name } ) {
diff --git a/compiler/generate/visitors/MustacheTag.js b/compiler/generate/visitors/MustacheTag.js
index 0d0a727542..b04f2e6a94 100644
--- a/compiler/generate/visitors/MustacheTag.js
+++ b/compiler/generate/visitors/MustacheTag.js
@@ -13,8 +13,7 @@ export default {
 
 		generator.addSourcemapLocations( node.expression );
 
-		const { contexts } = generator.contextualise( node.expression );
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
+		const { contexts, snippet } = generator.contextualise( node.expression );
 
 		if ( isReference( node.expression ) ) {
 			const reference = `${generator.source.slice( node.expression.start, node.expression.end )}`;
diff --git a/compiler/generate/visitors/attributes/addComponentAttributes.js b/compiler/generate/visitors/attributes/addComponentAttributes.js
index 10b2f6fa63..eb923ef60e 100644
--- a/compiler/generate/visitors/attributes/addComponentAttributes.js
+++ b/compiler/generate/visitors/attributes/addComponentAttributes.js
@@ -45,12 +45,12 @@ export default function addComponentAttributes ( generator, node, local ) {
 						} else {
 							generator.addSourcemapLocations( chunk.expression );
 
-							const { dependencies } = generator.contextualise( chunk.expression );
+							const { dependencies, snippet } = generator.contextualise( chunk.expression );
 							dependencies.forEach( dependency => {
 								if ( !~allDependencies.indexOf( dependency ) ) allDependencies.push( dependency );
 							});
 
-							return `( [✂${chunk.expression.start}-${chunk.expression.end}✂] )`;
+							return `( ${snippet} )`;
 						}
 					}).join( ' + ' )
 				);
diff --git a/compiler/generate/visitors/attributes/addElementAttributes.js b/compiler/generate/visitors/attributes/addElementAttributes.js
index 100b1782d6..7d961482aa 100644
--- a/compiler/generate/visitors/attributes/addElementAttributes.js
+++ b/compiler/generate/visitors/attributes/addElementAttributes.js
@@ -61,16 +61,15 @@ export default function addElementAttributes ( generator, node, local ) {
 					dynamic = true;
 
 					// dynamic – but potentially non-string – attributes
-					generator.contextualise( value.expression );
-					result = `[✂${value.expression.start}-${value.expression.end}✂]`;
+					const { snippet } = generator.contextualise( value.expression );
 
 					if ( propertyName ) {
 						local.update.push( deindent`
-							${local.name}.${propertyName} = ${result};
+							${local.name}.${propertyName} = ${snippet};
 						` );
 					} else {
 						local.update.push( deindent`
-							${local.name}.setAttribute( '${attribute.name}', ${result} );
+							${local.name}.setAttribute( '${attribute.name}', ${snippet} );
 						` );
 					}
 				}
@@ -86,8 +85,8 @@ export default function addElementAttributes ( generator, node, local ) {
 						} else {
 							generator.addSourcemapLocations( chunk.expression );
 
-							generator.contextualise( chunk.expression );
-							return `( [✂${chunk.expression.start}-${chunk.expression.end}✂] )`;
+							const { snippet } = generator.contextualise( chunk.expression );
+							return `( ${snippet} )`;
 						}
 					}).join( ' + ' )
 				);