refactor slightly

compiler/generate/visitors/EachBlock.js

@@ -18,8 +18,7 @@ export default {
 
 		generator.addSourcemapLocations( node.expression );
 
-		const { dependencies } = generator.contextualise( node.expression );
+		const { dependencies, snippet } = generator.contextualise( node.expression );
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
 
 		generator.current.updateStatements.push( deindent`
 			var ${name}_value = ${snippet};

compiler/generate/visitors/IfBlock.js

@@ -17,9 +17,7 @@ export default {
 		` );
 
 		generator.addSourcemapLocations( node.expression );
-		generator.contextualise( node.expression );
+		const { snippet } = generator.contextualise( node.expression );
-
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
 
 		const ifTrue = [ deindent`
 			if ( !${name } ) {

compiler/generate/visitors/MustacheTag.js

@@ -13,8 +13,7 @@ export default {
 
 		generator.addSourcemapLocations( node.expression );
 
-		const { contexts } = generator.contextualise( node.expression );
+		const { contexts, snippet } = generator.contextualise( node.expression );
-		const snippet = `[✂${node.expression.start}-${node.expression.end}✂]`;
 
 		if ( isReference( node.expression ) ) {
 			const reference = `${generator.source.slice( node.expression.start, node.expression.end )}`;

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( ' + ' )
 				);

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 );
+					const { snippet } = generator.contextualise( value.expression );
-					result = `[✂${value.expression.start}-${value.expression.end}✂]`;
 
 					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 );
+							const { snippet } = generator.contextualise( chunk.expression );
-							return `( [✂${chunk.expression.start}-${chunk.expression.end}✂] )`;
+							return `( ${snippet} )`;
 						}
 					}).join( ' + ' )
 				);