From a72a6ca4760f05dfa30096adbe66bfccc5577f59 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 9 Dec 2017 18:38:15 -0500
Subject: [PATCH] small tweak, possibly ahead of a much larger one

---
 src/generators/Generator.ts                   | 4 ++--
 src/generators/dom/Block.ts                   | 7 +------
 src/generators/server-side-rendering/Block.ts | 7 +------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index f5fc212979..abb9a02c61 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -201,7 +201,8 @@ export default class Generator {
 	}
 
 	contextualise(
-		block: DomBlock | SsrBlock,
+		contexts: Map<string, string>,
+		indexes: Map<string, string>,
 		expression: Node,
 		context: string,
 		isEventHandler: boolean
@@ -215,7 +216,6 @@ export default class Generator {
 		const usedIndexes: Set<string> = new Set();
 
 		const { code, helpers } = this;
-		const { contexts, indexes } = block;
 
 		let scope: Scope;
 		let lexicalDepth = 0;
diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts
index 747eedf41c..be47076174 100644
--- a/src/generators/dom/Block.ts
+++ b/src/generators/dom/Block.ts
@@ -164,12 +164,7 @@ export default class Block {
 	}
 
 	contextualise(expression: Node, context?: string, isEventHandler?: boolean) {
-		return this.generator.contextualise(
-			this,
-			expression,
-			context,
-			isEventHandler
-		);
+		return this.generator.contextualise(this.contexts, this.indexes, expression, context, isEventHandler);
 	}
 
 	mount(name: string, parentNode: string) {
diff --git a/src/generators/server-side-rendering/Block.ts b/src/generators/server-side-rendering/Block.ts
index 8d4836a475..24ef567854 100644
--- a/src/generators/server-side-rendering/Block.ts
+++ b/src/generators/server-side-rendering/Block.ts
@@ -44,11 +44,6 @@ export default class Block {
 	}
 
 	contextualise(expression: Node, context?: string, isEventHandler?: boolean) {
-		return this.generator.contextualise(
-			this,
-			expression,
-			context,
-			isEventHandler
-		);
+		return this.generator.contextualise(this.contexts, this.indexes, expression, context, isEventHandler);
 	}
 }