From 842e49155cfa47d886d4ca9a88990f47192ea992 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 15 Apr 2018 23:06:57 -0400
Subject: [PATCH] update validation tests

---
 test/runtime/index.js                         |  2 +-
 .../samples/a11y-html-has-lang/input.html     |  2 +-
 .../samples/a11y-html-has-lang/warnings.json  |  2 +-
 .../samples/a11y-iframe-has-title/input.html  |  2 +-
 .../a11y-iframe-has-title/warnings.json       |  2 +-
 .../a11y-tabindex-no-positive/input.html      |  2 +-
 .../await-component-is-used/input.html        | 12 ++---
 .../binding-input-type-dynamic/errors.json    |  2 +-
 .../binding-input-type-dynamic/input.html     |  2 +-
 .../errors.json                               |  2 +-
 .../input.html                                |  2 +-
 .../errors.json                               |  2 +-
 .../input.html                                |  2 +-
 .../component-slot-dynamic/errors.json        |  2 +-
 .../samples/component-slot-dynamic/input.html |  2 +-
 .../component-slot-each-block/errors.json     |  2 +-
 .../component-slot-each-block/input.html      |  4 +-
 .../component-slotted-each-block/errors.json  |  2 +-
 .../component-slotted-each-block/input.html   |  6 +--
 .../component-slotted-if-block/errors.json    |  2 +-
 .../component-slotted-if-block/input.html     |  6 +--
 .../computed-purity-check-no-this/errors.json |  2 +-
 .../computed-purity-check-no-this/input.html  |  2 +-
 .../errors.json                               |  2 +-
 .../computed-purity-check-this-get/input.html |  2 +-
 .../errors.json                               |  6 +--
 .../input.html                                |  6 +--
 .../each-block-invalid-context/errors.json    |  6 +--
 .../each-block-invalid-context/input.html     |  6 +--
 .../each-block-multiple-children/input.html   | 10 ++--
 .../samples/empty-block-dev/input.html        |  6 +--
 .../samples/empty-block-dev/warnings.json     |  6 +--
 .../samples/empty-block-prod/input.html       |  6 +--
 .../samples/helper-clash-context/input.html   |  6 +--
 .../helper-clash-context/warnings.json        |  6 +--
 .../input.html                                |  2 +-
 .../warnings.json                             |  2 +-
 .../helper-purity-check-this-get/errors.json  |  2 +-
 .../helper-purity-check-this-get/input.html   |  2 +-
 .../input.html                                |  2 +-
 .../method-nonexistent-helper/warnings.json   |  2 +-
 .../samples/method-nonexistent/warnings.json  |  2 +-
 .../errors.json                               |  2 +-
 .../input.html                                |  2 +-
 .../errors.json                               |  2 +-
 .../input.html                                |  2 +-
 .../errors.json                               | 13 -----
 .../input.html                                |  9 ----
 .../samples/store-unexpected/input.html       |  1 -
 .../samples/store-unexpected/warnings.json    | 13 -----
 .../input.html                                |  2 +-
 .../input.html                                | 30 +----------
 .../warnings.json                             | 54 +------------------
 .../textarea-value-children/errors.json       |  2 +-
 .../textarea-value-children/input.html        |  2 +-
 .../title-no-attributes/errors-v2.json        | 13 -----
 .../samples/title-no-attributes/errors.json   |  2 +-
 .../samples/title-no-attributes/input-v2.html |  3 --
 .../samples/title-no-attributes/input.html    |  4 +-
 .../samples/title-no-children/errors.json     |  2 +-
 .../samples/title-no-children/input.html      |  4 +-
 .../errors.json                               |  6 +--
 .../input.html                                |  2 +-
 .../window-binding-invalid-value/errors.json  |  6 +--
 .../window-binding-invalid-value/input.html   |  2 +-
 .../window-binding-invalid-width/errors.json  |  6 +--
 .../window-binding-invalid-width/input.html   |  2 +-
 .../window-binding-invalid/errors.json        |  6 +--
 .../samples/window-binding-invalid/input.html |  2 +-
 .../samples/window-binding-online/input.html  |  2 +-
 .../samples/window-event-invalid/input.html   |  2 +-
 .../window-event-invalid/warnings.json        |  8 +--
 72 files changed, 111 insertions(+), 243 deletions(-)
 delete mode 100644 test/validator/samples/properties-computed-no-destructuring/errors.json
 delete mode 100644 test/validator/samples/properties-computed-no-destructuring/input.html
 delete mode 100644 test/validator/samples/store-unexpected/input.html
 delete mode 100644 test/validator/samples/store-unexpected/warnings.json
 delete mode 100644 test/validator/samples/title-no-attributes/errors-v2.json
 delete mode 100644 test/validator/samples/title-no-attributes/input-v2.html

diff --git a/test/runtime/index.js b/test/runtime/index.js
index 806b0dab79..109615f309 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -25,7 +25,7 @@ function getName(filename) {
 	return base[0].toUpperCase() + base.slice(1);
 }
 
-describe.only("runtime", () => {
+describe("runtime", () => {
 	before(() => {
 		svelte = loadSvelte(false);
 		svelte$ = loadSvelte(true);
diff --git a/test/validator/samples/a11y-html-has-lang/input.html b/test/validator/samples/a11y-html-has-lang/input.html
index 41f2fc6276..0fa84d90a6 100644
--- a/test/validator/samples/a11y-html-has-lang/input.html
+++ b/test/validator/samples/a11y-html-has-lang/input.html
@@ -1,5 +1,5 @@
 <html lang="en"></html>
 <html lang="en-US"></html>
-<html lang={{language}}></html>
+<html lang={language}></html>
 
 <html></html>
diff --git a/test/validator/samples/a11y-html-has-lang/warnings.json b/test/validator/samples/a11y-html-has-lang/warnings.json
index c8c7c51cc6..7189296725 100644
--- a/test/validator/samples/a11y-html-has-lang/warnings.json
+++ b/test/validator/samples/a11y-html-has-lang/warnings.json
@@ -10,6 +10,6 @@
 			"line": 5,
 			"column": 13
 		},
-		"pos": 84
+		"pos": 82
 	}
 ]
diff --git a/test/validator/samples/a11y-iframe-has-title/input.html b/test/validator/samples/a11y-iframe-has-title/input.html
index 2b5060b80e..5e07ca5a08 100644
--- a/test/validator/samples/a11y-iframe-has-title/input.html
+++ b/test/validator/samples/a11y-iframe-has-title/input.html
@@ -1 +1 @@
-<iframe src='{{src}}'></iframe>
\ No newline at end of file
+<iframe src='{src}'></iframe>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-iframe-has-title/warnings.json b/test/validator/samples/a11y-iframe-has-title/warnings.json
index 33706158df..3dc5a6644a 100644
--- a/test/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/test/validator/samples/a11y-iframe-has-title/warnings.json
@@ -8,7 +8,7 @@
 		},
 		"end": {
 			"line": 1,
-			"column": 31
+			"column": 29
 		},
 		"pos": 0
 	}
diff --git a/test/validator/samples/a11y-tabindex-no-positive/input.html b/test/validator/samples/a11y-tabindex-no-positive/input.html
index fa34d69f2d..e922078221 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/input.html
+++ b/test/validator/samples/a11y-tabindex-no-positive/input.html
@@ -1,4 +1,4 @@
 <div tabindex='-1'/>
 <div tabindex='0'/>
 <div tabindex='1'/>
-<div tabindex='{{foo}}'/>
\ No newline at end of file
+<div tabindex='{foo}'/>
\ No newline at end of file
diff --git a/test/validator/samples/await-component-is-used/input.html b/test/validator/samples/await-component-is-used/input.html
index f27202d6dd..17f2d04d36 100644
--- a/test/validator/samples/await-component-is-used/input.html
+++ b/test/validator/samples/await-component-is-used/input.html
@@ -1,10 +1,10 @@
-{{#await promise}}
+{#await promise}
 	<p>Loading</p>
-{{then data}}
-	<Component :data />
-{{catch err}}
-	<p>Error: {{err}}</p>
-{{/await}}
+{:then data}
+	<Component {data} />
+{:catch err}
+	<p>Error: {err}</p>
+{/await}
 
 <script>
 	import Component from './Component.html';
diff --git a/test/validator/samples/binding-input-type-dynamic/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json
index 315c8aadb6..559c348ac6 100644
--- a/test/validator/samples/binding-input-type-dynamic/errors.json
+++ b/test/validator/samples/binding-input-type-dynamic/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 44
+		"column": 42
 	},
 	"pos": 24
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/input.html b/test/validator/samples/binding-input-type-dynamic/input.html
index 4f54010bdc..ae6223e05a 100644
--- a/test/validator/samples/binding-input-type-dynamic/input.html
+++ b/test/validator/samples/binding-input-type-dynamic/input.html
@@ -1 +1 @@
-<input bind:value='foo' type='{{inputType}}'>
\ No newline at end of file
+<input bind:value='foo' type='{inputType}'>
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/errors.json b/test/validator/samples/binding-select-multiple-dynamic/errors.json
index b85ff5a3ac..e77ce0c615 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/test/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 28
+		"column": 29
 	},
 	"pos": 19
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/input.html b/test/validator/samples/binding-select-multiple-dynamic/input.html
index 17e928c562..9e197c1b3d 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/input.html
+++ b/test/validator/samples/binding-select-multiple-dynamic/input.html
@@ -1,4 +1,4 @@
-<select bind:value :multiple>
+<select bind:value {multiple}>
 	<option>1</option>
 	<option>2</option>
 	<option>3</option>
diff --git a/test/validator/samples/component-slot-dynamic-attribute/errors.json b/test/validator/samples/component-slot-dynamic-attribute/errors.json
index 8652396949..2a470b24a5 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/test/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 2,
-		"column": 23
+		"column": 21
 	},
 	"pos": 18
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-dynamic-attribute/input.html b/test/validator/samples/component-slot-dynamic-attribute/input.html
index 1827eb2dd3..0c0866459f 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/input.html
+++ b/test/validator/samples/component-slot-dynamic-attribute/input.html
@@ -1,3 +1,3 @@
 <Nested>
-	<button slot='{{foo}}'>click me</button>
+	<button slot='{foo}'>click me</button>
 </Nested>
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-dynamic/errors.json b/test/validator/samples/component-slot-dynamic/errors.json
index e09b1ab916..a34b79cb95 100644
--- a/test/validator/samples/component-slot-dynamic/errors.json
+++ b/test/validator/samples/component-slot-dynamic/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 20
+		"column": 18
 	},
 	"pos": 6
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-dynamic/input.html b/test/validator/samples/component-slot-dynamic/input.html
index 4636cd4973..74348a49db 100644
--- a/test/validator/samples/component-slot-dynamic/input.html
+++ b/test/validator/samples/component-slot-dynamic/input.html
@@ -1 +1 @@
-<slot name='{{foo}}'></slot>
\ No newline at end of file
+<slot name='{foo}'></slot>
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-each-block/errors.json b/test/validator/samples/component-slot-each-block/errors.json
index 0e67b707ab..a0c00ae56e 100644
--- a/test/validator/samples/component-slot-each-block/errors.json
+++ b/test/validator/samples/component-slot-each-block/errors.json
@@ -9,5 +9,5 @@
 		"line": 2,
 		"column": 1
 	},
-	"pos": 27
+	"pos": 25
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-each-block/input.html b/test/validator/samples/component-slot-each-block/input.html
index 2e4f7cb812..ddc27a7d0d 100644
--- a/test/validator/samples/component-slot-each-block/input.html
+++ b/test/validator/samples/component-slot-each-block/input.html
@@ -1,3 +1,3 @@
-{{#each things as thing}}
+{#each things as thing}
 	<slot name='foo'></slot>
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-each-block/errors.json b/test/validator/samples/component-slotted-each-block/errors.json
index 5d0102abf2..e54e80e25d 100644
--- a/test/validator/samples/component-slotted-each-block/errors.json
+++ b/test/validator/samples/component-slotted-each-block/errors.json
@@ -9,5 +9,5 @@
 		"line": 3,
 		"column": 17
 	},
-	"pos": 43
+	"pos": 41
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-each-block/input.html b/test/validator/samples/component-slotted-each-block/input.html
index 81166f3e54..dca4980f30 100644
--- a/test/validator/samples/component-slotted-each-block/input.html
+++ b/test/validator/samples/component-slotted-each-block/input.html
@@ -1,7 +1,7 @@
 <Nested>
-	{{#each things as thing}}
-		<div slot='foo'>{{thing}}</div>
-	{{/each}}
+	{#each things as thing}
+		<div slot='foo'>{thing}</div>
+	{/each}
 </Nested>
 
 <script>
diff --git a/test/validator/samples/component-slotted-if-block/errors.json b/test/validator/samples/component-slotted-if-block/errors.json
index 09518af674..2b55d88b2a 100644
--- a/test/validator/samples/component-slotted-if-block/errors.json
+++ b/test/validator/samples/component-slotted-if-block/errors.json
@@ -9,5 +9,5 @@
 		"line": 3,
 		"column": 17
 	},
-	"pos": 31
+	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-if-block/input.html b/test/validator/samples/component-slotted-if-block/input.html
index d063ab03aa..c620019799 100644
--- a/test/validator/samples/component-slotted-if-block/input.html
+++ b/test/validator/samples/component-slotted-if-block/input.html
@@ -1,7 +1,7 @@
 <Nested>
-	{{#if thing}}
-		<div slot='foo'>{{thing}}</div>
-	{{/if}}
+	{#if thing}
+		<div slot='foo'>{thing}</div>
+	{/if}
 </Nested>
 
 <script>
diff --git a/test/validator/samples/computed-purity-check-no-this/errors.json b/test/validator/samples/computed-purity-check-no-this/errors.json
index f704b7a3ef..774d8834fd 100644
--- a/test/validator/samples/computed-purity-check-no-this/errors.json
+++ b/test/validator/samples/computed-purity-check-no-this/errors.json
@@ -1,7 +1,7 @@
 [{
 	"code": "impure-computed",
 	"message": "Computed properties should be pure functions — they do not have access to the component instance and cannot use 'this'. Did you mean to put this in 'methods'?",
-	"pos": 83,
+	"pos": 81,
 	"loc": {
 		"line": 7,
 		"column": 4
diff --git a/test/validator/samples/computed-purity-check-no-this/input.html b/test/validator/samples/computed-purity-check-no-this/input.html
index a7e4130e9e..d278e9e127 100644
--- a/test/validator/samples/computed-purity-check-no-this/input.html
+++ b/test/validator/samples/computed-purity-check-no-this/input.html
@@ -1,4 +1,4 @@
-<button>{{foo}}</button>
+<button>{foo}</button>
 
 <script>
 	export default {
diff --git a/test/validator/samples/computed-purity-check-this-get/errors.json b/test/validator/samples/computed-purity-check-this-get/errors.json
index 035d5fee4f..e8d238ad5f 100644
--- a/test/validator/samples/computed-purity-check-this-get/errors.json
+++ b/test/validator/samples/computed-purity-check-this-get/errors.json
@@ -1,7 +1,7 @@
 [{
 	"code": "impure-computed",
 	"message": "Cannot use this.get(...) — values must be passed into the function as arguments",
-	"pos": 73,
+	"pos": 71,
 	"loc": {
 		"line": 7,
 		"column": 11
diff --git a/test/validator/samples/computed-purity-check-this-get/input.html b/test/validator/samples/computed-purity-check-this-get/input.html
index 1188c94d97..5a16951645 100644
--- a/test/validator/samples/computed-purity-check-this-get/input.html
+++ b/test/validator/samples/computed-purity-check-this-get/input.html
@@ -1,4 +1,4 @@
-{{foo}}
+{foo}
 
 <script>
 	export default {
diff --git a/test/validator/samples/each-block-invalid-context-destructured/errors.json b/test/validator/samples/each-block-invalid-context-destructured/errors.json
index abec802656..dea69922d9 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -3,11 +3,11 @@
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
 	"loc": {
 		"line": 1,
-		"column": 18
+		"column": 17
 	},
 	"end": {
 		"line": 1,
-		"column": 18
+		"column": 17
 	},
-	"pos": 18
+	"pos": 17
 }]
\ No newline at end of file
diff --git a/test/validator/samples/each-block-invalid-context-destructured/input.html b/test/validator/samples/each-block-invalid-context-destructured/input.html
index ce31634a85..9e76daab64 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/input.html
+++ b/test/validator/samples/each-block-invalid-context-destructured/input.html
@@ -1,3 +1,3 @@
-{{#each cases as [case]}}
-	{{case.title}}
-{{/each}}
\ No newline at end of file
+{#each cases as [case]}
+	{case.title}
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/each-block-invalid-context/errors.json b/test/validator/samples/each-block-invalid-context/errors.json
index dea69922d9..aaafbb5940 100644
--- a/test/validator/samples/each-block-invalid-context/errors.json
+++ b/test/validator/samples/each-block-invalid-context/errors.json
@@ -3,11 +3,11 @@
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
 	"loc": {
 		"line": 1,
-		"column": 17
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 17
+		"column": 16
 	},
-	"pos": 17
+	"pos": 16
 }]
\ No newline at end of file
diff --git a/test/validator/samples/each-block-invalid-context/input.html b/test/validator/samples/each-block-invalid-context/input.html
index 212c29ecdc..7e30416e2a 100644
--- a/test/validator/samples/each-block-invalid-context/input.html
+++ b/test/validator/samples/each-block-invalid-context/input.html
@@ -1,3 +1,3 @@
-{{#each cases as case}}
-	{{case.title}}
-{{/each}}
\ No newline at end of file
+{#each cases as case}
+	{case.title}
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/each-block-multiple-children/input.html b/test/validator/samples/each-block-multiple-children/input.html
index 9d996a3acf..384dce49b6 100644
--- a/test/validator/samples/each-block-multiple-children/input.html
+++ b/test/validator/samples/each-block-multiple-children/input.html
@@ -1,10 +1,10 @@
-{{#each things as thing}}
+{#each things as thing}
 	<span>this only exists...</span>
 	<span>...to increase test coverage</span>
-{{/each}}
+{/each}
 
-{{#each things as thing}}{{soDoesThis}}{{/each}}
+{#each things as thing}{soDoesThis}{/each}
 
-{{#each things as thing}}
+{#each things as thing}
 	andThis
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/empty-block-dev/input.html b/test/validator/samples/empty-block-dev/input.html
index 32b892d470..979ff837e9 100644
--- a/test/validator/samples/empty-block-dev/input.html
+++ b/test/validator/samples/empty-block-dev/input.html
@@ -1,5 +1,5 @@
-{{#each things as thing}}
+{#each things as thing}
 
-{{/each}}
+{/each}
 
-{{#each things as thing}}{{/each}}
\ No newline at end of file
+{#each things as thing}{/each}
\ No newline at end of file
diff --git a/test/validator/samples/empty-block-dev/warnings.json b/test/validator/samples/empty-block-dev/warnings.json
index 23af585594..f6c5298c43 100644
--- a/test/validator/samples/empty-block-dev/warnings.json
+++ b/test/validator/samples/empty-block-dev/warnings.json
@@ -8,7 +8,7 @@
 		},
 		"end": {
 			"line": 3,
-			"column": 9
+			"column": 7
 		},
 		"pos": 0
 	},
@@ -21,8 +21,8 @@
 		},
 		"end": {
 			"line": 5,
-			"column": 34
+			"column": 30
 		},
-		"pos": 38
+		"pos": 34
 	}
 ]
\ No newline at end of file
diff --git a/test/validator/samples/empty-block-prod/input.html b/test/validator/samples/empty-block-prod/input.html
index 32b892d470..979ff837e9 100644
--- a/test/validator/samples/empty-block-prod/input.html
+++ b/test/validator/samples/empty-block-prod/input.html
@@ -1,5 +1,5 @@
-{{#each things as thing}}
+{#each things as thing}
 
-{{/each}}
+{/each}
 
-{{#each things as thing}}{{/each}}
\ No newline at end of file
+{#each things as thing}{/each}
\ No newline at end of file
diff --git a/test/validator/samples/helper-clash-context/input.html b/test/validator/samples/helper-clash-context/input.html
index 85f6faf117..d90285a094 100644
--- a/test/validator/samples/helper-clash-context/input.html
+++ b/test/validator/samples/helper-clash-context/input.html
@@ -1,6 +1,6 @@
-{{#each things as thing}}
-	{{thing}}
-{{/each}}
+{#each things as thing}
+	{thing}
+{/each}
 
 <script>
 	export default {
diff --git a/test/validator/samples/helper-clash-context/warnings.json b/test/validator/samples/helper-clash-context/warnings.json
index 1203c9c0ba..83b4826399 100644
--- a/test/validator/samples/helper-clash-context/warnings.json
+++ b/test/validator/samples/helper-clash-context/warnings.json
@@ -3,11 +3,11 @@
 	"message": "Context clashes with a helper. Rename one or the other to eliminate any ambiguity",
 	"loc": {
 		"line": 1,
-		"column": 18
+		"column": 17
 	},
 	"end": {
 		"line": 1,
-		"column": 23
+		"column": 22
 	},
-	"pos": 18
+	"pos": 17
 }]
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-needs-arguments/input.html b/test/validator/samples/helper-purity-check-needs-arguments/input.html
index 244c67e697..9c0a6f8ef6 100644
--- a/test/validator/samples/helper-purity-check-needs-arguments/input.html
+++ b/test/validator/samples/helper-purity-check-needs-arguments/input.html
@@ -1,4 +1,4 @@
-{{foo()}}
+{foo()}
 
 <script>
 	export default {
diff --git a/test/validator/samples/helper-purity-check-needs-arguments/warnings.json b/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
index cc30948df7..26af5f0e13 100644
--- a/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
+++ b/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
@@ -1,7 +1,7 @@
 [{
 	"code": "impure-helper",
 	"message": "Helpers should be pure functions, with at least one argument",
-	"pos": 54,
+	"pos": 52,
 	"loc": {
 		"line": 6,
 		"column": 3
diff --git a/test/validator/samples/helper-purity-check-this-get/errors.json b/test/validator/samples/helper-purity-check-this-get/errors.json
index 134cf9bb58..5481fbf512 100644
--- a/test/validator/samples/helper-purity-check-this-get/errors.json
+++ b/test/validator/samples/helper-purity-check-this-get/errors.json
@@ -1,7 +1,7 @@
 [{
 	"code": "impure-helper",
 	"message": "Cannot use this.get(...) — values must be passed into the helper function as arguments",
-	"pos": 74,
+	"pos": 72,
 	"loc": {
 		"line": 7,
 		"column": 11
diff --git a/test/validator/samples/helper-purity-check-this-get/input.html b/test/validator/samples/helper-purity-check-this-get/input.html
index 8807be05f6..7fdd1b61d1 100644
--- a/test/validator/samples/helper-purity-check-this-get/input.html
+++ b/test/validator/samples/helper-purity-check-this-get/input.html
@@ -1,4 +1,4 @@
-{{foo()}}
+{foo()}
 
 <script>
 	export default {
diff --git a/test/validator/samples/helper-purity-check-uses-arguments/input.html b/test/validator/samples/helper-purity-check-uses-arguments/input.html
index 559f0ba0c0..8395021487 100644
--- a/test/validator/samples/helper-purity-check-uses-arguments/input.html
+++ b/test/validator/samples/helper-purity-check-uses-arguments/input.html
@@ -1,4 +1,4 @@
-{{sum(1, 2, 3)}}
+{sum(1, 2, 3)}
 
 <script>
 	export default {
diff --git a/test/validator/samples/method-nonexistent-helper/warnings.json b/test/validator/samples/method-nonexistent-helper/warnings.json
index 40cc65371c..7f612d3d7c 100644
--- a/test/validator/samples/method-nonexistent-helper/warnings.json
+++ b/test/validator/samples/method-nonexistent-helper/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-callee",
-	"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
+	"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, store.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
 	"pos": 18,
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/method-nonexistent/warnings.json b/test/validator/samples/method-nonexistent/warnings.json
index d65dd9b1db..7c7dc1aadd 100644
--- a/test/validator/samples/method-nonexistent/warnings.json
+++ b/test/validator/samples/method-nonexistent/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-callee",
-	"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire, destroy or bar)",
+	"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, store.*, set, fire, destroy or bar)",
 	"pos": 18,
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/properties-computed-cannot-be-reserved/errors.json b/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
index d7e2702d40..0fa8601572 100644
--- a/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
+++ b/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
@@ -8,7 +8,7 @@
 	},
 	"end": {
 		"line": 9,
-		"column": 18
+		"column": 6
 	},
 	"pos": 87
 }]
diff --git a/test/validator/samples/properties-computed-cannot-be-reserved/input.html b/test/validator/samples/properties-computed-cannot-be-reserved/input.html
index 06bd2bf694..172456784d 100644
--- a/test/validator/samples/properties-computed-cannot-be-reserved/input.html
+++ b/test/validator/samples/properties-computed-cannot-be-reserved/input.html
@@ -6,7 +6,7 @@
 			};
 		},
 		computed: {
-			new: a => a * 2
+			new: ({ a }) => a * 2
 		}
 	};
 </script>
diff --git a/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json b/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json
index 7cdc2df451..8759767afd 100644
--- a/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json
+++ b/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 9,
-		"column": 28
+		"column": 16
 	},
 	"pos": 87
 }]
diff --git a/test/validator/samples/properties-computed-must-be-valid-function-names/input.html b/test/validator/samples/properties-computed-must-be-valid-function-names/input.html
index 1c9173f523..35e2c598e0 100644
--- a/test/validator/samples/properties-computed-must-be-valid-function-names/input.html
+++ b/test/validator/samples/properties-computed-must-be-valid-function-names/input.html
@@ -6,7 +6,7 @@
 			};
 		},
 		computed: {
-			"with-hyphen": a => a * 2
+			"with-hyphen": ({ a }) => a * 2
 		}
 	};
 </script>
diff --git a/test/validator/samples/properties-computed-no-destructuring/errors.json b/test/validator/samples/properties-computed-no-destructuring/errors.json
deleted file mode 100644
index 7ac9e009d6..0000000000
--- a/test/validator/samples/properties-computed-no-destructuring/errors.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[{
-	"code": "invalid-computed-arguments",
-	"message": "Computed properties cannot use destructuring in function parameters",
-	"loc": {
-		"line": 6,
-		"column": 8
-	},
-	"end": {
-		"line": 6,
-		"column": 16
-	},
-	"pos": 62
-}]
diff --git a/test/validator/samples/properties-computed-no-destructuring/input.html b/test/validator/samples/properties-computed-no-destructuring/input.html
deleted file mode 100644
index ae88d47b9e..0000000000
--- a/test/validator/samples/properties-computed-no-destructuring/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		computed: {
-			foo ({ a, b }) {}
-		}
-	};
-</script>
diff --git a/test/validator/samples/store-unexpected/input.html b/test/validator/samples/store-unexpected/input.html
deleted file mode 100644
index 589f28e647..0000000000
--- a/test/validator/samples/store-unexpected/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<button on:click='store.foo()'>foo</button>
\ No newline at end of file
diff --git a/test/validator/samples/store-unexpected/warnings.json b/test/validator/samples/store-unexpected/warnings.json
deleted file mode 100644
index 5e0f69f8e6..0000000000
--- a/test/validator/samples/store-unexpected/warnings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[{
-	"code": "options-missing-store",
-	"message": "compile with `store: true` in order to call store methods",
-	"loc": {
-		"line": 1,
-		"column": 18
-	},
-	"end": {
-		"line": 1,
-		"column": 29
-	},
-	"pos": 18
-}]
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-declared-namespace/input.html b/test/validator/samples/svg-child-component-declared-namespace/input.html
index c158d7fdf5..536f47107e 100644
--- a/test/validator/samples/svg-child-component-declared-namespace/input.html
+++ b/test/validator/samples/svg-child-component-declared-namespace/input.html
@@ -1,4 +1,4 @@
-<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 
 <script>
 	export default {
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/input.html b/test/validator/samples/svg-child-component-undeclared-namespace/input.html
index ab75adcc59..8ba5698f05 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/input.html
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/input.html
@@ -1,29 +1 @@
-<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
-
-{{#each foo as bar}}
-
-	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
-
-{{else}}
-
-	{{#each foo as bar}}
-		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
-	{{/each}}
-
-{{/each}}
-
-{{#if foo}}
-
-{{elseif bar}}
-
-	{{#each foo as bar}}
-		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
-	{{/each}}
-
-{{else}}
-
-	{{#each foo as bar}}
-		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
-	{{/each}}
-
-{{/if}}
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
index 0bd22dc725..8a43c938e6 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
@@ -7,59 +7,7 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 65
+		"column": 57
 	},
 	"pos": 0
-},
-{
-	"code": "missing-namespace",
-	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
-	"loc": {
-		"column": 1,
-		"line": 5
-	},
-	"end": {
-		"line": 5,
-		"column": 66
-	},
-	"pos": 90
-},
-{
-	"code": "missing-namespace",
-	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
-	"loc": {
-		"column": 2,
-		"line": 10
-	},
-	"end": {
-		"line": 10,
-		"column": 67
-	},
-	"pos": 191
-},
-{
-	"code": "missing-namespace",
-	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
-	"loc": {
-		"column": 2,
-		"line": 20
-	},
-	"end": {
-		"line": 20,
-		"column": 67
-	},
-	"pos": 333
-},
-{
-	"code": "missing-namespace",
-	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
-	"loc": {
-		"column": 2,
-		"line": 26
-	},
-	"end": {
-		"line": 26,
-		"column": 67
-	},
-	"pos": 445
 }]
diff --git a/test/validator/samples/textarea-value-children/errors.json b/test/validator/samples/textarea-value-children/errors.json
index 24d94b9342..bf603f7159 100644
--- a/test/validator/samples/textarea-value-children/errors.json
+++ b/test/validator/samples/textarea-value-children/errors.json
@@ -7,7 +7,7 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 25
+		"column": 23
 	},
 	"pos": 10
 }]
\ No newline at end of file
diff --git a/test/validator/samples/textarea-value-children/input.html b/test/validator/samples/textarea-value-children/input.html
index 70ba6d5a1f..d94066aa48 100644
--- a/test/validator/samples/textarea-value-children/input.html
+++ b/test/validator/samples/textarea-value-children/input.html
@@ -1,3 +1,3 @@
-<textarea value='{{foo}}'>
+<textarea value='{foo}'>
 	some illegal text
 </textarea>
\ No newline at end of file
diff --git a/test/validator/samples/title-no-attributes/errors-v2.json b/test/validator/samples/title-no-attributes/errors-v2.json
deleted file mode 100644
index 84b421c093..0000000000
--- a/test/validator/samples/title-no-attributes/errors-v2.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[{
-	"code": "illegal-attribute",
-	"message": "<title> cannot have attributes",
-	"loc": {
-		"line": 2,
-		"column": 8
-	},
-	"end": {
-		"line": 2,
-		"column": 25
-	},
-	"pos": 22
-}]
\ No newline at end of file
diff --git a/test/validator/samples/title-no-attributes/errors.json b/test/validator/samples/title-no-attributes/errors.json
index ebf39c3213..84b421c093 100644
--- a/test/validator/samples/title-no-attributes/errors.json
+++ b/test/validator/samples/title-no-attributes/errors.json
@@ -9,5 +9,5 @@
 		"line": 2,
 		"column": 25
 	},
-	"pos": 16
+	"pos": 22
 }]
\ No newline at end of file
diff --git a/test/validator/samples/title-no-attributes/input-v2.html b/test/validator/samples/title-no-attributes/input-v2.html
deleted file mode 100644
index 0e2dbefa73..0000000000
--- a/test/validator/samples/title-no-attributes/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svelte:head>
-	<title data-invalid=true>a static title</title>
-</svelte:head>
\ No newline at end of file
diff --git a/test/validator/samples/title-no-attributes/input.html b/test/validator/samples/title-no-attributes/input.html
index 358ea4b119..0e2dbefa73 100644
--- a/test/validator/samples/title-no-attributes/input.html
+++ b/test/validator/samples/title-no-attributes/input.html
@@ -1,3 +1,3 @@
-<:Head>
+<svelte:head>
 	<title data-invalid=true>a static title</title>
-</:Head>
\ No newline at end of file
+</svelte:head>
\ No newline at end of file
diff --git a/test/validator/samples/title-no-children/errors.json b/test/validator/samples/title-no-children/errors.json
index 12110831f7..c304e1b8e8 100644
--- a/test/validator/samples/title-no-children/errors.json
+++ b/test/validator/samples/title-no-children/errors.json
@@ -9,5 +9,5 @@
 		"line": 2,
 		"column": 35
 	},
-	"pos": 19
+	"pos": 25
 }]
\ No newline at end of file
diff --git a/test/validator/samples/title-no-children/input.html b/test/validator/samples/title-no-children/input.html
index 6b93de8c13..dcefadf2b0 100644
--- a/test/validator/samples/title-no-children/input.html
+++ b/test/validator/samples/title-no-children/input.html
@@ -1,3 +1,3 @@
-<:Head>
+<svelte:head>
 	<title>an <strong>invalid</strong> title</title>
-</:Head>
\ No newline at end of file
+</svelte:head>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/errors.json b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
index 2f57874100..a91a928c60 100644
--- a/test/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -3,11 +3,11 @@
 	"message": "'innerwidth' is not a valid binding on <:Window> (did you mean 'innerWidth'?)",
 	"loc": {
 		"line": 1,
-		"column": 9
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 28
+		"column": 34
 	},
-	"pos": 9
+	"pos": 15
 }]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/input.html b/test/validator/samples/window-binding-invalid-innerwidth/input.html
index 867e2c92dd..13c3d3ec97 100644
--- a/test/validator/samples/window-binding-invalid-innerwidth/input.html
+++ b/test/validator/samples/window-binding-invalid-innerwidth/input.html
@@ -1 +1 @@
-<:Window bind:innerwidth='w'/>
\ No newline at end of file
+<svelte:window bind:innerwidth='w'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-value/errors.json b/test/validator/samples/window-binding-invalid-value/errors.json
index 77256d371e..32009552d6 100644
--- a/test/validator/samples/window-binding-invalid-value/errors.json
+++ b/test/validator/samples/window-binding-invalid-value/errors.json
@@ -3,11 +3,11 @@
 	"message": "Bindings on <:Window/> must be to top-level properties, e.g. 'baz' rather than 'foo.bar.baz'",
 	"loc": {
 		"line": 1,
-		"column": 26
+		"column": 32
 	},
 	"end": {
 		"line": 1,
-		"column": 37
+		"column": 43
 	},
-	"pos": 26
+	"pos": 32
 }]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-value/input.html b/test/validator/samples/window-binding-invalid-value/input.html
index aa0bb48fae..c1f407e22d 100644
--- a/test/validator/samples/window-binding-invalid-value/input.html
+++ b/test/validator/samples/window-binding-invalid-value/input.html
@@ -1 +1 @@
-<:Window bind:innerWidth='foo.bar.baz'/>
\ No newline at end of file
+<svelte:window bind:innerWidth='foo.bar.baz'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-width/errors.json b/test/validator/samples/window-binding-invalid-width/errors.json
index d065c442b4..1ac57e825e 100644
--- a/test/validator/samples/window-binding-invalid-width/errors.json
+++ b/test/validator/samples/window-binding-invalid-width/errors.json
@@ -3,11 +3,11 @@
 	"message": "'width' is not a valid binding on <:Window> (did you mean 'innerWidth'?)",
 	"loc": {
 		"line": 1,
-		"column": 9
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 23
+		"column": 29
 	},
-	"pos": 9
+	"pos": 15
 }]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-width/input.html b/test/validator/samples/window-binding-invalid-width/input.html
index 5b8348a818..f464dd0b6f 100644
--- a/test/validator/samples/window-binding-invalid-width/input.html
+++ b/test/validator/samples/window-binding-invalid-width/input.html
@@ -1 +1 @@
-<:Window bind:width='w'/>
\ No newline at end of file
+<svelte:window bind:width='w'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid/errors.json b/test/validator/samples/window-binding-invalid/errors.json
index a7bbd525e5..9bebff624d 100644
--- a/test/validator/samples/window-binding-invalid/errors.json
+++ b/test/validator/samples/window-binding-invalid/errors.json
@@ -3,11 +3,11 @@
 	"message": "'potato' is not a valid binding on <:Window> — valid bindings are innerWidth, innerHeight, outerWidth, outerHeight, scrollX, scrollY or online",
 	"loc": {
 		"line": 1,
-		"column": 9
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 26
+		"column": 32
 	},
-	"pos": 9
+	"pos": 15
 }]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid/input.html b/test/validator/samples/window-binding-invalid/input.html
index 3897b664b5..439a198126 100644
--- a/test/validator/samples/window-binding-invalid/input.html
+++ b/test/validator/samples/window-binding-invalid/input.html
@@ -1 +1 @@
-<:Window bind:potato='foo'/>
\ No newline at end of file
+<svelte:window bind:potato='foo'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-online/input.html b/test/validator/samples/window-binding-online/input.html
index 7932cc140b..8684545304 100644
--- a/test/validator/samples/window-binding-online/input.html
+++ b/test/validator/samples/window-binding-online/input.html
@@ -1 +1 @@
-<:Window bind:online/>
\ No newline at end of file
+<svelte:window bind:online/>
\ No newline at end of file
diff --git a/test/validator/samples/window-event-invalid/input.html b/test/validator/samples/window-event-invalid/input.html
index c9c32eecac..b3ec7ceabd 100644
--- a/test/validator/samples/window-event-invalid/input.html
+++ b/test/validator/samples/window-event-invalid/input.html
@@ -1 +1 @@
-<:Window on:resize='resize()'/>
\ No newline at end of file
+<svelte:window on:resize='resize()'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-event-invalid/warnings.json b/test/validator/samples/window-event-invalid/warnings.json
index 3cea282338..47eda14472 100644
--- a/test/validator/samples/window-event-invalid/warnings.json
+++ b/test/validator/samples/window-event-invalid/warnings.json
@@ -1,13 +1,13 @@
 [{
 	"code": "invalid-callee",
-	"message": "'resize' is an invalid callee (should be one of this.*, event.*, options.*, console.*, set, fire or destroy)",
+	"message": "'resize' is an invalid callee (should be one of this.*, event.*, options.*, console.*, store.*, set, fire or destroy)",
 	"loc": {
 		"line": 1,
-		"column": 20
+		"column": 26
 	},
 	"end": {
 		"line": 1,
-		"column": 28
+		"column": 34
 	},
-	"pos": 20
+	"pos": 26
 }]