From 5fea63a5de5cd522d45cfb0ff11f0922584ea66a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 10 Jan 2018 22:04:49 -0500
Subject: [PATCH] validate contents of await blocks (#1061)

---
 src/validate/html/index.ts                      |  6 ++++++
 .../samples/await-component-is-used/input.html  | 17 +++++++++++++++++
 .../await-component-is-used/warnings.json       |  1 +
 3 files changed, 24 insertions(+)
 create mode 100644 test/validator/samples/await-component-is-used/input.html
 create mode 100644 test/validator/samples/await-component-is-used/warnings.json

diff --git a/src/validate/html/index.ts b/src/validate/html/index.ts
index bf94b63c52..88609d174f 100644
--- a/src/validate/html/index.ts
+++ b/src/validate/html/index.ts
@@ -54,6 +54,12 @@ export default function validateHtml(validator: Validator, html: Node) {
 		if (node.else) {
 			visit(node.else);
 		}
+
+		if (node.type === 'AwaitBlock') {
+			visit(node.pending);
+			visit(node.then);
+			visit(node.catch);
+		}
 	}
 
 	html.children.forEach(visit);
diff --git a/test/validator/samples/await-component-is-used/input.html b/test/validator/samples/await-component-is-used/input.html
new file mode 100644
index 0000000000..f27202d6dd
--- /dev/null
+++ b/test/validator/samples/await-component-is-used/input.html
@@ -0,0 +1,17 @@
+{{#await promise}}
+	<p>Loading</p>
+{{then data}}
+	<Component :data />
+{{catch err}}
+	<p>Error: {{err}}</p>
+{{/await}}
+
+<script>
+	import Component from './Component.html';
+
+	export default {
+		components: {
+			Component
+		}
+	};
+</script>
diff --git a/test/validator/samples/await-component-is-used/warnings.json b/test/validator/samples/await-component-is-used/warnings.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/test/validator/samples/await-component-is-used/warnings.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file