diff --git a/package.json b/package.json
index ae3df5b31b..89229e3130 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "glob": "^7.1.1",
     "is-reference": "^1.1.0",
     "jsdom": "^11.6.1",
-    "locate-character": "^2.0.0",
+    "locate-character": "^2.0.5",
     "magic-string": "^0.22.3",
     "mocha": "^3.2.0",
     "nightmare": "^2.10.0",
diff --git a/src/css/Stylesheet.ts b/src/css/Stylesheet.ts
index 3f5262fcc1..4a3630f300 100644
--- a/src/css/Stylesheet.ts
+++ b/src/css/Stylesheet.ts
@@ -392,20 +392,22 @@ export default class Stylesheet {
 		const handler = (selector: Selector) => {
 			const pos = selector.node.start;
 
-			if (!locator) locator = getLocator(this.source);
-			const { line, column } = locator(pos);
+			if (!locator) locator = getLocator(this.source, { offsetLine: 1 });
+			const start = locator(pos);
+			const end = locator(selector.node.end);
 
-			const frame = getCodeFrame(this.source, line, column);
+			const frame = getCodeFrame(this.source, start.line - 1, start.column);
 			const message = `Unused CSS selector`;
 
 			onwarn({
 				code: `css-unused-selector`,
 				message,
 				frame,
-				loc: { line: line + 1, column },
+				start,
+				end,
 				pos,
 				filename: this.filename,
-				toString: () => `${message} (${line + 1}:${column})\n${frame}`,
+				toString: () => `${message} (${start.line}:${start.column})\n${frame}`,
 			});
 		};
 
diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 714945fba2..5bbf2e17f1 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -5,7 +5,6 @@ import { getLocator } from 'locate-character';
 import Stats from '../Stats';
 import deindent from '../utils/deindent';
 import CodeBuilder from '../utils/CodeBuilder';
-import getCodeFrame from '../utils/getCodeFrame';
 import flattenReference from '../utils/flattenReference';
 import reservedNames from '../utils/reservedNames';
 import namespaces from '../utils/namespaces';
diff --git a/src/index.ts b/src/index.ts
index 875202118b..6178b1e45f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,9 +23,9 @@ function normalizeOptions(options: CompileOptions): CompileOptions {
 }
 
 function defaultOnwarn(warning: Warning) {
-	if (warning.loc) {
+	if (warning.start) {
 		console.warn(
-			`(${warning.loc.line}:${warning.loc.column}) – ${warning.message}`
+			`(${warning.start.line}:${warning.start.column}) – ${warning.message}`
 		); // eslint-disable-line no-console
 	} else {
 		console.warn(warning.message); // eslint-disable-line no-console
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 6ed7e31dde..c49ea0494f 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -28,7 +28,7 @@ export interface Parsed {
 }
 
 export interface Warning {
-	loc?: { line: number; column: number; pos?: number };
+	start?: { line: number; column: number; pos?: number };
 	end?: { line: number; column: number; };
 	pos?: number;
 	code: string;
diff --git a/src/parse/index.ts b/src/parse/index.ts
index f3d724c847..1ea91e040b 100644
--- a/src/parse/index.ts
+++ b/src/parse/index.ts
@@ -3,7 +3,6 @@ import { locate, Location } from 'locate-character';
 import fragment from './state/fragment';
 import { whitespace } from '../utils/patterns';
 import { trimStart, trimEnd } from '../utils/trim';
-import getCodeFrame from '../utils/getCodeFrame';
 import reservedNames from '../utils/reservedNames';
 import fullCharCodeAt from '../utils/fullCharCodeAt';
 import hash from '../utils/hash';
diff --git a/src/utils/error.ts b/src/utils/error.ts
index 35daba2c80..acaab37117 100644
--- a/src/utils/error.ts
+++ b/src/utils/error.ts
@@ -3,14 +3,14 @@ import getCodeFrame from '../utils/getCodeFrame';
 
 class CompileError extends Error {
 	code: string;
-	loc: { line: number, column: number };
+	start: { line: number, column: number };
 	end: { line: number, column: number };
 	pos: number;
 	filename: string;
 	frame: string;
 
 	toString() {
-		return `${this.message} (${this.loc.line}:${this.loc.column})\n${this.frame}`;
+		return `${this.message} (${this.start.line}:${this.start.column})\n${this.frame}`;
 	}
 }
 
@@ -25,16 +25,16 @@ export default function error(message: string, props: {
 	const error = new CompileError(message);
 	error.name = props.name;
 
-	const start = locate(props.source, props.start);
-	const end = locate(props.source, props.end || props.start);
+	const start = locate(props.source, props.start, { offsetLine: 1 });
+	const end = locate(props.source, props.end || props.start, { offsetLine: 1 });
 
 	error.code = props.code;
-	error.loc = { line: start.line + 1, column: start.column };
-	error.end = { line: end.line + 1, column: end.column };
+	error.start = start;
+	error.end = end;
 	error.pos = props.start;
 	error.filename = props.filename;
 
-	error.frame = getCodeFrame(props.source, start.line, start.column);
+	error.frame = getCodeFrame(props.source, start.line - 1, start.column);
 
 	throw error;
 }
\ No newline at end of file
diff --git a/src/validate/index.ts b/src/validate/index.ts
index 9734124d26..b79a93a0ce 100644
--- a/src/validate/index.ts
+++ b/src/validate/index.ts
@@ -73,18 +73,18 @@ export class Validator {
 	}
 
 	warn(pos: { start: number, end: number }, { code, message }: { code: string, message: string }) {
-		if (!this.locator) this.locator = getLocator(this.source);
+		if (!this.locator) this.locator = getLocator(this.source, { offsetLine: 1 });
 		const start = this.locator(pos.start);
 		const end = this.locator(pos.end);
 
-		const frame = getCodeFrame(this.source, start.line, start.column);
+		const frame = getCodeFrame(this.source, start.line - 1, start.column);
 
 		this.stats.warn({
 			code,
 			message,
 			frame,
-			loc: { line: start.line + 1, column: start.column },
-			end: { line: end.line + 1, column: end.column },
+			start,
+			end,
 			pos: pos.start,
 			filename: this.filename,
 			toString: () => `${message} (${start.line + 1}:${start.column})\n${frame}`,
diff --git a/test/css/samples/empty-class/_config.js b/test/css/samples/empty-class/_config.js
index 5ffb0321bb..fb1565c7bc 100644
--- a/test/css/samples/empty-class/_config.js
+++ b/test/css/samples/empty-class/_config.js
@@ -3,9 +3,15 @@ export default {
 		filename: "SvelteComponent.html",
 		code: `css-unused-selector`,
 		message: "Unused CSS selector",
-		loc: {
+		start: {
 			line: 4,
-			column: 1
+			column: 1,
+			character: 31
+		},
+		end: {
+			line: 4,
+			column: 3,
+			character: 33
 		},
 		pos: 31,
 		frame: `
diff --git a/test/css/samples/omit-scoping-attribute-descendant/_config.js b/test/css/samples/omit-scoping-attribute-descendant/_config.js
index 1fb3055ae1..a4aaec7c19 100644
--- a/test/css/samples/omit-scoping-attribute-descendant/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant/_config.js
@@ -2,9 +2,15 @@ export default {
 	warnings: [{
 		code: `css-unused-selector`,
 		message: 'Unused CSS selector',
-		loc: {
+		start: {
 			line: 8,
-			column: 1
+			column: 1,
+			character: 74
+		},
+		end: {
+			line: 8,
+			column: 8,
+			character: 81
 		},
 		pos: 74,
 		frame: `
diff --git a/test/css/samples/refs-qualified/_config.js b/test/css/samples/refs-qualified/_config.js
index 9f75d743cc..dbc3ac2b4e 100644
--- a/test/css/samples/refs-qualified/_config.js
+++ b/test/css/samples/refs-qualified/_config.js
@@ -6,9 +6,15 @@ export default {
 	warnings: [{
 		code: `css-unused-selector`,
 		message: 'Unused CSS selector',
-		loc: {
+		start: {
 			column: 1,
-			line: 12
+			line: 12,
+			character: 169
+		},
+		end: {
+			column: 20,
+			line: 12,
+			character: 188
 		},
 		pos: 169,
 		frame: `
diff --git a/test/css/samples/refs/_config.js b/test/css/samples/refs/_config.js
index 4c684d76e5..76252a8a5f 100644
--- a/test/css/samples/refs/_config.js
+++ b/test/css/samples/refs/_config.js
@@ -2,9 +2,15 @@ export default {
 	warnings: [{
 		code: `css-unused-selector`,
 		message: 'Unused CSS selector',
-		loc: {
+		start: {
 			column: 1,
-			line: 14
+			line: 14,
+			character: 120
+		},
+		end: {
+			column: 6,
+			line: 14,
+			character: 125
 		},
 		pos: 120,
 		frame: `
diff --git a/test/css/samples/unused-selector-leading/_config.js b/test/css/samples/unused-selector-leading/_config.js
index ec245fe80a..c01e978405 100644
--- a/test/css/samples/unused-selector-leading/_config.js
+++ b/test/css/samples/unused-selector-leading/_config.js
@@ -4,9 +4,15 @@ export default {
 			filename: "SvelteComponent.html",
 			code: `css-unused-selector`,
 			message: "Unused CSS selector",
-			loc: {
+			start: {
 				line: 4,
-				column: 1
+				column: 1,
+				character: 34
+			},
+			end: {
+				line: 4,
+				column: 5,
+				character: 38
 			},
 			pos: 34,
 			frame: `
@@ -22,9 +28,15 @@ export default {
 			filename: "SvelteComponent.html",
 			code: `css-unused-selector`,
 			message: "Unused CSS selector",
-			loc: {
+			start: {
+				line: 4,
+				column: 13,
+				character: 46
+			},
+			end: {
 				line: 4,
-				column: 13
+				column: 17,
+				character: 50
 			},
 			pos: 46,
 			frame: `
diff --git a/test/css/samples/unused-selector-ternary/_config.js b/test/css/samples/unused-selector-ternary/_config.js
index f4f7826ffc..f99ad90601 100644
--- a/test/css/samples/unused-selector-ternary/_config.js
+++ b/test/css/samples/unused-selector-ternary/_config.js
@@ -7,9 +7,15 @@ export default {
 		filename: "SvelteComponent.html",
 		code: `css-unused-selector`,
 		message: "Unused CSS selector",
-		loc: {
+		start: {
 			line: 12,
-			column: 1
+			column: 1,
+			character: 123
+		},
+		end: {
+			line: 12,
+			column: 13,
+			character: 135
 		},
 		pos: 123,
 		frame: `
diff --git a/test/css/samples/unused-selector/_config.js b/test/css/samples/unused-selector/_config.js
index 23f4f75771..5f6abbc08b 100644
--- a/test/css/samples/unused-selector/_config.js
+++ b/test/css/samples/unused-selector/_config.js
@@ -3,9 +3,15 @@ export default {
 		filename: "SvelteComponent.html",
 		code: `css-unused-selector`,
 		message: "Unused CSS selector",
-		loc: {
+		start: {
 			line: 8,
-			column: 1
+			column: 1,
+			character: 60
+		},
+		end: {
+			line: 8,
+			column: 5,
+			character: 64
 		},
 		pos: 60,
 		frame: `
diff --git a/test/js/index.js b/test/js/index.js
index 1d6e499679..8c6104fa37 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -71,7 +71,7 @@ describe("js", () => {
 					expectedBundle.trim().replace(/^[ \t]+$/gm, "")
 				);
 			}).catch(err => {
-				if (err.loc) console.error(err.loc);
+				if (err.start) console.error(err.start);
 				throw err;
 			});
 		});
diff --git a/test/parser/index.js b/test/parser/index.js
index f2acd631d9..7a87fc51b1 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -37,9 +37,9 @@ describe('parse', () => {
 				try {
 					assert.equal(err.code, expectedError.code);
 					assert.equal(err.message, expectedError.message);
-					assert.deepEqual(err.loc, expectedError.loc);
+					assert.deepEqual(err.start, expectedError.start);
 					assert.equal(err.pos, expectedError.pos);
-					assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
+					assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.start.line}:${expectedError.start.column})`);
 				} catch (err2) {
 					const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
 					throw e;
diff --git a/test/parser/samples/attribute-unique-error/error.json b/test/parser/samples/attribute-unique-error/error.json
index 737157b246..dd14572149 100644
--- a/test/parser/samples/attribute-unique-error/error.json
+++ b/test/parser/samples/attribute-unique-error/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "duplicate-attribute",
 	"message": "Attributes need to be unique",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 17
+		"column": 17,
+		"character": 17
 	},
 	"pos": 17
 }
diff --git a/test/parser/samples/error-binding-disabled/error.json b/test/parser/samples/error-binding-disabled/error.json
index 71953c4176..63f01e7056 100644
--- a/test/parser/samples/error-binding-disabled/error.json
+++ b/test/parser/samples/error-binding-disabled/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "binding-disabled",
 	"message": "Two-way binding is disabled",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 7
+		"column": 7,
+		"character": 7
 	},
 	"pos": 7
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/error.json b/test/parser/samples/error-binding-mustaches/error.json
index 4d23927086..b2a5c1c564 100644
--- a/test/parser/samples/error-binding-mustaches/error.json
+++ b/test/parser/samples/error-binding-mustaches/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-directive-value",
 	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 19
+		"column": 19,
+		"character": 19
 	},
 	"pos": 19
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/error.json b/test/parser/samples/error-binding-rvalue/error.json
index b774b8a29f..2d081afac5 100644
--- a/test/parser/samples/error-binding-rvalue/error.json
+++ b/test/parser/samples/error-binding-rvalue/error.json
@@ -2,8 +2,9 @@
 	"code": "invalid-directive-value",
 	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
 	"pos": 19,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 19
+		"column": 19,
+		"character": 19
 	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-comment-unclosed/error.json b/test/parser/samples/error-comment-unclosed/error.json
index d83ecbdc09..8e355fb821 100644
--- a/test/parser/samples/error-comment-unclosed/error.json
+++ b/test/parser/samples/error-comment-unclosed/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unexpected-eof",
 	"message": "comment was left open, expected -->",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 24
+		"column": 24,
+		"character": 24
 	},
 	"pos": 24
 }
diff --git a/test/parser/samples/error-css/error.json b/test/parser/samples/error-css/error.json
index db6703b3d0..90f7a091d2 100644
--- a/test/parser/samples/error-css/error.json
+++ b/test/parser/samples/error-css/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "css-syntax-error",
 	"message": "LeftCurlyBracket is expected",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 16
+		"column": 16,
+		"character": 24
 	},
 	"pos": 24
 }
diff --git a/test/parser/samples/error-event-handler/error.json b/test/parser/samples/error-event-handler/error.json
index 43be6e3951..8ccfa1c881 100644
--- a/test/parser/samples/error-event-handler/error.json
+++ b/test/parser/samples/error-event-handler/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-directive-value",
 	"message": "Expected a method call",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"pos": 15
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-illegal-expression/error.json b/test/parser/samples/error-illegal-expression/error.json
index fdce2f1fb9..d8b48a786e 100644
--- a/test/parser/samples/error-illegal-expression/error.json
+++ b/test/parser/samples/error-illegal-expression/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "parse-error",
 	"message": "Assigning to rvalue",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 1
+		"column": 1,
+		"character": 1
 	},
 	"pos": 1
 }
diff --git a/test/parser/samples/error-multiple-styles/error.json b/test/parser/samples/error-multiple-styles/error.json
index 937a37a1f3..1c460c5bad 100644
--- a/test/parser/samples/error-multiple-styles/error.json
+++ b/test/parser/samples/error-multiple-styles/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "duplicate-style",
 	"message": "You can only have one top-level <style> tag per component",
-	"loc": {
+	"start": {
 		"line": 9,
-		"column": 0
+		"column": 0,
+		"character": 58
 	},
 	"pos": 58
 }
diff --git a/test/parser/samples/error-ref-value/error.json b/test/parser/samples/error-ref-value/error.json
index b5b83782ba..5352eb4722 100644
--- a/test/parser/samples/error-ref-value/error.json
+++ b/test/parser/samples/error-ref-value/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-directive-value",
 	"message": "ref directives cannot have a value",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 14
+		"column": 14,
+		"character": 14
 	},
 	"pos": 14
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/error.json b/test/parser/samples/error-script-unclosed/error.json
index 59c0415233..d7bb9a8e37 100644
--- a/test/parser/samples/error-script-unclosed/error.json
+++ b/test/parser/samples/error-script-unclosed/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unclosed-script",
 	"message": "<script> must have a closing tag",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 8
+		"column": 8,
+		"character": 32
 	},
 	"pos": 32
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/error.json b/test/parser/samples/error-self-reference/error.json
index 581f5e67a1..798b5cb300 100644
--- a/test/parser/samples/error-self-reference/error.json
+++ b/test/parser/samples/error-self-reference/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-self-placement",
 	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 1
+		"column": 1,
+		"character": 1
 	},
 	"pos": 1
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/error.json b/test/parser/samples/error-unexpected-end-of-input-b/error.json
index 3fd2d400f6..b37e83cf81 100644
--- a/test/parser/samples/error-unexpected-end-of-input-b/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-b/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 2
+		"column": 2,
+		"character": 2
 	},
 	"pos": 2
 }
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/error.json b/test/parser/samples/error-unexpected-end-of-input-c/error.json
index 2b3402a4e3..0db949000a 100644
--- a/test/parser/samples/error-unexpected-end-of-input-c/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-c/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 1
+		"column": 1,
+		"character": 1
 	},
 	"pos": 1
 }
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/error.json b/test/parser/samples/error-unexpected-end-of-input-d/error.json
index 267f245aed..c17df47730 100644
--- a/test/parser/samples/error-unexpected-end-of-input-d/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-d/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unclosed-block",
 	"message": "Block was left open",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 0
+		"column": 0,
+		"character": 0
 	},
 	"pos": 0
 }
diff --git a/test/parser/samples/error-unexpected-end-of-input/error.json b/test/parser/samples/error-unexpected-end-of-input/error.json
index 9239341473..4f45973b76 100644
--- a/test/parser/samples/error-unexpected-end-of-input/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "unclosed-element",
 	"message": "<div> was left open",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 0
+		"column": 0,
+		"character": 0
 	},
 	"pos": 0
 }
diff --git a/test/parser/samples/error-unmatched-closing-tag/error.json b/test/parser/samples/error-unmatched-closing-tag/error.json
index 320eb966c9..54af634f2a 100644
--- a/test/parser/samples/error-unmatched-closing-tag/error.json
+++ b/test/parser/samples/error-unmatched-closing-tag/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-closing-tag",
 	"message": "</div> attempted to close an element that was not open",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 0
+		"column": 0,
+		"character": 0
 	},
 	"pos": 0
 }
diff --git a/test/parser/samples/error-void-closing/error.json b/test/parser/samples/error-void-closing/error.json
index fac1d04a13..ded796d291 100644
--- a/test/parser/samples/error-void-closing/error.json
+++ b/test/parser/samples/error-void-closing/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-void-content",
 	"message": "<input> is a void element and cannot have children, or a closing tag",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 23
+		"column": 23,
+		"character": 23
 	},
 	"pos": 23
 }
diff --git a/test/parser/samples/error-window-children/error.json b/test/parser/samples/error-window-children/error.json
index 88c8968fd8..741aa80a90 100644
--- a/test/parser/samples/error-window-children/error.json
+++ b/test/parser/samples/error-window-children/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-window-content",
 	"message": "<svelte:window> cannot have children",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"pos": 15
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/error.json b/test/parser/samples/error-window-duplicate/error.json
index da820574e1..7899556b68 100644
--- a/test/parser/samples/error-window-duplicate/error.json
+++ b/test/parser/samples/error-window-duplicate/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "duplicate-window",
 	"message": "A component can only have one <svelte:window> tag",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 0
+		"column": 0,
+		"character": 17
 	},
 	"pos": 17
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/error.json b/test/parser/samples/error-window-inside-block/error.json
index 77ecd08eb3..8591899f67 100644
--- a/test/parser/samples/error-window-inside-block/error.json
+++ b/test/parser/samples/error-window-inside-block/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-window-placement",
 	"message": "<svelte:window> tags cannot be inside elements or blocks",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 11
 	},
 	"pos": 11
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/error.json b/test/parser/samples/error-window-inside-element/error.json
index 60ca3b9883..570bf768c3 100644
--- a/test/parser/samples/error-window-inside-element/error.json
+++ b/test/parser/samples/error-window-inside-element/error.json
@@ -1,9 +1,10 @@
 {
 	"code": "invalid-window-placement",
 	"message": "<svelte:window> tags cannot be inside elements or blocks",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 7
 	},
 	"pos": 7
 }
\ No newline at end of file
diff --git a/test/sourcemaps/samples/basic/test.js b/test/sourcemaps/samples/basic/test.js
index a8803c0063..bc63ec1292 100644
--- a/test/sourcemaps/samples/basic/test.js
+++ b/test/sourcemaps/samples/basic/test.js
@@ -1,14 +1,14 @@
 export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	const expected = locateInSource( 'foo.bar.baz' );
 
-	let loc;
+	let start;
 	let actual;
 
-	loc = locateInGenerated( 'foo.bar.baz' );
+	start = locateInGenerated( 'foo.bar.baz' );
 
 	actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
@@ -18,11 +18,11 @@ export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 		column: expected.column
 	});
 
-	loc = locateInGenerated( 'foo.bar.baz', loc.character + 1 );
+	start = locateInGenerated( 'foo.bar.baz', start.character + 1 );
 
 	actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/sourcemaps/samples/binding-shorthand/test.js b/test/sourcemaps/samples/binding-shorthand/test.js
index 8aa8c050a9..e6ffe69618 100644
--- a/test/sourcemaps/samples/binding-shorthand/test.js
+++ b/test/sourcemaps/samples/binding-shorthand/test.js
@@ -1,15 +1,15 @@
 export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	const expected = locateInSource( 'potato' );
 
-	let loc;
+	let start;
 
-	loc = locateInGenerated( 'potato' );
-	loc = locateInGenerated( 'potato', loc.character + 1 );
-	loc = locateInGenerated( 'potato', loc.character + 1 ); // we need the third instance of 'potato'
+	start = locateInGenerated( 'potato' );
+	start = locateInGenerated( 'potato', start.character + 1 );
+	start = locateInGenerated( 'potato', start.character + 1 ); // we need the third instance of 'potato'
 
 	const actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/sourcemaps/samples/binding/test.js b/test/sourcemaps/samples/binding/test.js
index 8737930371..9318da73d0 100644
--- a/test/sourcemaps/samples/binding/test.js
+++ b/test/sourcemaps/samples/binding/test.js
@@ -1,14 +1,14 @@
 export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	const expected = locateInSource( 'bar.baz' );
 
-	let loc;
+	let start;
 	let actual;
 
-	loc = locateInGenerated( 'bar.baz' );
+	start = locateInGenerated( 'bar.baz' );
 
 	actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
@@ -18,11 +18,11 @@ export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 		column: expected.column
 	});
 
-	loc = locateInGenerated( 'bar.baz', loc.character + 1 );
+	start = locateInGenerated( 'bar.baz', start.character + 1 );
 
 	actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/sourcemaps/samples/css/test.js b/test/sourcemaps/samples/css/test.js
index 0c9d7e9b6e..b5ca58d87e 100644
--- a/test/sourcemaps/samples/css/test.js
+++ b/test/sourcemaps/samples/css/test.js
@@ -1,11 +1,11 @@
 export function test ({ assert, smcCss, locateInSource, locateInGeneratedCss }) {
 	const expected = locateInSource( '.foo' );
 
-	const loc = locateInGeneratedCss( '.foo' );
+	const start = locateInGeneratedCss( '.foo' );
 
 	const actual = smcCss.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/sourcemaps/samples/each-block/test.js b/test/sourcemaps/samples/each-block/test.js
index d31c565ced..b0c1eb9583 100644
--- a/test/sourcemaps/samples/each-block/test.js
+++ b/test/sourcemaps/samples/each-block/test.js
@@ -2,11 +2,11 @@ export function test({ assert, code, smc, locateInSource, locateInGenerated }) {
 	const startIndex = code.indexOf('create_main_fragment');
 
 	const expected = locateInSource('each');
-	const loc = locateInGenerated('length', startIndex );
+	const start = locateInGenerated('length', startIndex );
 
 	const actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/sourcemaps/samples/script/test.js b/test/sourcemaps/samples/script/test.js
index 80468b23bf..aa5e593d2b 100644
--- a/test/sourcemaps/samples/script/test.js
+++ b/test/sourcemaps/samples/script/test.js
@@ -1,10 +1,10 @@
 export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	const expected = locateInSource( '42' );
-	const loc = locateInGenerated( '42' );
+	const start = locateInGenerated( '42' );
 
 	const actual = smc.originalPositionFor({
-		line: loc.line + 1,
-		column: loc.column
+		line: start.line + 1,
+		column: start.column
 	});
 
 	assert.deepEqual( actual, {
diff --git a/test/stats/index.js b/test/stats/index.js
index 7ff64f0fe0..fba9926061 100644
--- a/test/stats/index.js
+++ b/test/stats/index.js
@@ -50,7 +50,7 @@ describe('stats', () => {
 				}
 
 				assert.equal(error.message, expectedError.message);
-				assert.deepEqual(error.loc, expectedError.loc);
+				assert.deepEqual(error.start, expectedError.start);
 				assert.deepEqual(error.end, expectedError.end);
 				assert.equal(error.pos, expectedError.pos);
 			}
diff --git a/test/validator/index.js b/test/validator/index.js
index ce89833b7c..852ac4191b 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -28,8 +28,8 @@ describe("validate", () => {
 
 				const { stats } = svelte.compile(input, {
 					onwarn(warning) {
-						const { code, message, pos, loc, end } = warning;
-						warnings.push({ code, message, pos, loc, end });
+						const { code, message, pos, start, end } = warning;
+						warnings.push({ code, message, pos, start, end });
 					},
 					dev: config.dev,
 					generate: false
@@ -42,7 +42,7 @@ describe("validate", () => {
 						code: full.code,
 						message: full.message,
 						pos: full.pos,
-						loc: full.loc,
+						start: full.start,
 						end: full.end
 					}, lite);
 				});
@@ -65,7 +65,7 @@ describe("validate", () => {
 
 				assert.equal(error.code, expected.code);
 				assert.equal(error.message, expected.message);
-				assert.deepEqual(error.loc, expected.loc);
+				assert.deepEqual(error.start, expected.start);
 				assert.deepEqual(error.end, expected.end);
 				assert.equal(error.pos, expected.pos);
 			}
@@ -90,7 +90,7 @@ describe("validate", () => {
 					code: warning.code,
 					message: warning.message,
 					pos: warning.pos,
-					loc: warning.loc
+					start: warning.start
 				});
 			},
 			generate: false
@@ -100,7 +100,7 @@ describe("validate", () => {
 				code: `options-lowercase-name`,
 				message: "options.name should be capitalised",
 				pos: undefined,
-				loc: undefined
+				start: undefined
 			}
 		]);
 	});
@@ -114,7 +114,7 @@ describe("validate", () => {
 					code: warning.code,
 					message: warning.message,
 					pos: warning.pos,
-					loc: warning.loc
+					start: warning.start
 				});
 			},
 			generate: false
diff --git a/test/validator/samples/a11y-alt-text/warnings.json b/test/validator/samples/a11y-alt-text/warnings.json
index ec54e281e7..7ce5fb2d8f 100644
--- a/test/validator/samples/a11y-alt-text/warnings.json
+++ b/test/validator/samples/a11y-alt-text/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <img> element should have an alt attribute",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 19
+			"column": 19,
+			"character": 19
 		},
 		"pos": 0
 	},
@@ -16,13 +18,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <area> element should have an alt, aria-label or aria-labelledby attribute",
-		"loc": {
+		"start": {
 			"line": 4,
-			"column": 1
+			"column": 1,
+			"character": 28
 		},
 		"end": {
 			"line": 4,
-			"column": 7
+			"column": 7,
+			"character": 34
 		},
 		"pos": 28
 	},
@@ -30,13 +34,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <object> element should have a title, aria-label or aria-labelledby attribute",
-		"loc": {
+		"start": {
 			"line": 7,
-			"column": 0
+			"column": 0,
+			"character": 43
 		},
 		"end": {
 			"line": 7,
-			"column": 17
+			"column": 17,
+			"character": 60
 		},
 		"pos": 43
 	},
@@ -44,13 +50,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
-		"loc": {
+		"start": {
 			"line": 9,
-			"column": 0
+			"column": 0,
+			"character": 62
 		},
 		"end": {
 			"line": 9,
-			"column": 20
+			"column": 20,
+			"character": 82
 		},
 		"pos": 62
 	}
diff --git a/test/validator/samples/a11y-anchor-has-content/warnings.json b/test/validator/samples/a11y-anchor-has-content/warnings.json
index 151fb6cd32..8708311f3c 100644
--- a/test/validator/samples/a11y-anchor-has-content/warnings.json
+++ b/test/validator/samples/a11y-anchor-has-content/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "a11y-missing-content",
 	"message": "A11y: <a> element should have child content",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 0
+		"column": 0,
+		"character": 0
 	},
 	"end": {
 		"line": 1,
-		"column": 19
+		"column": 19,
+		"character": 19
 	},
 	"pos": 0
 }]
\ No newline at end of file
diff --git a/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json b/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
index a5533b5971..eb62ce8db6 100644
--- a/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
+++ b/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
@@ -1,41 +1,47 @@
 [
-  {
-    "code": "a11y-missing-attribute",
-    "message": "A11y: <a> element should have an href attribute",
-    "loc": {
-      "line": 1,
-      "column": 11
-    },
+	{
+		"code": "a11y-missing-attribute",
+		"message": "A11y: <a> element should have an href attribute",
+		"start": {
+			"line": 1,
+			"column": 11,
+			"character": 11
+		},
 		"end": {
 			"line": 1,
-			"column": 37
+			"column": 37,
+			"character": 37
+		},
+		"pos": 11
+	},
+	{
+		"code": "a11y-invalid-attribute",
+		"message": "A11y: '' is not a valid xlink:href attribute",
+		"start": {
+			"line": 2,
+			"column": 14,
+			"character": 65
 		},
-    "pos": 11
-  },
-  {
-    "code": "a11y-invalid-attribute",
-    "message": "A11y: '' is not a valid xlink:href attribute",
-    "loc": {
-      "line": 2,
-      "column": 14
-    },
 		"end": {
 			"line": 2,
-			"column": 27
+			"column": 27,
+			"character": 78
+		},
+		"pos": 65
+	},
+	{
+		"code": "a11y-invalid-attribute",
+		"message": "A11y: '#' is not a valid xlink:href attribute",
+		"start": {
+			"line": 3,
+			"column": 14,
+			"character": 130
 		},
-    "pos": 65
-  },
-  {
-    "code": "a11y-invalid-attribute",
-    "message": "A11y: '#' is not a valid xlink:href attribute",
-    "loc": {
-      "line": 3,
-      "column": 14
-    },
 		"end": {
 			"line": 3,
-			"column": 28
+			"column": 28,
+			"character": 144
 		},
-    "pos": 130
-  }
+		"pos": 130
+	}
 ]
diff --git a/test/validator/samples/a11y-anchor-is-valid/warnings.json b/test/validator/samples/a11y-anchor-is-valid/warnings.json
index 70ea534a4b..532c44ad24 100644
--- a/test/validator/samples/a11y-anchor-is-valid/warnings.json
+++ b/test/validator/samples/a11y-anchor-is-valid/warnings.json
@@ -2,39 +2,45 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <a> element should have an href attribute",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 26
+			"column": 26,
+			"character": 26
 		},
 		"pos": 0
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '' is not a valid href attribute",
-		"loc": {
+		"start": {
 			"line": 2,
-			"column": 3
+			"column": 3,
+			"character": 30
 		},
 		"end": {
 			"line": 2,
-			"column": 10
+			"column": 10,
+			"character": 37
 		},
 		"pos": 30
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '#' is not a valid href attribute",
-		"loc": {
+		"start": {
 			"line": 3,
-			"column": 3
+			"column": 3,
+			"character": 53
 		},
 		"end": {
 			"line": 3,
-			"column": 11
+			"column": 11,
+			"character": 61
 		},
 		"pos": 53
 	}
diff --git a/test/validator/samples/a11y-aria-props/warnings.json b/test/validator/samples/a11y-aria-props/warnings.json
index 4eb6815fe1..73d34fc589 100644
--- a/test/validator/samples/a11y-aria-props/warnings.json
+++ b/test/validator/samples/a11y-aria-props/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-unknown-aria-attribute",
 		"message": "A11y: Unknown aria attribute 'aria-labeledby' (did you mean 'labelledby'?)",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 20
+			"column": 20,
+			"character": 20
 		},
 		"end": {
 			"line": 1,
-			"column": 40
+			"column": 40,
+			"character": 40
 		},
 		"pos": 20
 	},
@@ -16,13 +18,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
-		"loc": {
+		"start": {
 			"column": 0,
-			"line": 1
+			"line": 1,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 41
+			"column": 41,
+			"character": 41
 		},
 		"pos": 0
 	}
diff --git a/test/validator/samples/a11y-aria-role/warnings.json b/test/validator/samples/a11y-aria-role/warnings.json
index 425f790dd7..22fb2d52b6 100644
--- a/test/validator/samples/a11y-aria-role/warnings.json
+++ b/test/validator/samples/a11y-aria-role/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-unknown-role",
 		"message": "A11y: Unknown role 'toooltip' (did you mean 'tooltip'?)",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 5
+			"column": 5,
+			"character": 5
 		},
 		"end": {
 			"line": 1,
-			"column": 20
+			"column": 20,
+			"character": 20
 		},
 		"pos": 5
 	}
diff --git a/test/validator/samples/a11y-aria-unsupported-element/warnings.json b/test/validator/samples/a11y-aria-unsupported-element/warnings.json
index f837b13178..4597e3e868 100644
--- a/test/validator/samples/a11y-aria-unsupported-element/warnings.json
+++ b/test/validator/samples/a11y-aria-unsupported-element/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-aria-attributes",
 		"message": "A11y: <meta> should not have aria-* attributes",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 6
+			"column": 6,
+			"character": 6
 		},
 		"end": {
 			"line": 1,
-			"column": 25
+			"column": 25,
+			"character": 25
 		},
 		"pos": 6
 	},
@@ -16,13 +18,15 @@
 	{
 		"code": "a11y-misplaced-role",
 		"message": "A11y: <meta> should not have role attribute",
-		"loc": {
+		"start": {
 			"line": 2,
-			"column": 6
+			"column": 6,
+			"character": 33
 		},
 		"end": {
 			"line": 2,
-			"column": 20
+			"column": 20,
+			"character": 47
 		},
 		"pos": 33
 	}
diff --git a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
index dc09be6ad7..ee5a89d3ff 100644
--- a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
+++ b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
@@ -2,26 +2,30 @@
 	{
 		"code": "a11y-structure",
 		"message": "A11y: <figcaption> must be first or last child of <figure>",
-		"loc": {
+		"start": {
 			"line": 4,
-			"column": 1
+			"column": 1,
+			"character": 57
 		},
 		"end": {
 			"line": 6,
-			"column": 14
+			"column": 14,
+			"character": 115
 		},
 		"pos": 57
 	},
 	{
 		"code": "a11y-structure",
 		"message": "A11y: <figcaption> must be an immediate child of <figure>",
-		"loc": {
+		"start": {
 			"line": 15,
-			"column": 2
+			"column": 2,
+			"character": 252
 		},
 		"end": {
 			"line": 17,
-			"column": 15
+			"column": 15,
+			"character": 328
 		},
 		"pos": 252
 	}
diff --git a/test/validator/samples/a11y-heading-has-content/warnings.json b/test/validator/samples/a11y-heading-has-content/warnings.json
index a785116866..9cb77adc02 100644
--- a/test/validator/samples/a11y-heading-has-content/warnings.json
+++ b/test/validator/samples/a11y-heading-has-content/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-missing-content",
 		"message": "A11y: <h1> element should have child content",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 9
+			"column": 9,
+			"character": 9
 		},
 		"pos": 0
 	},
@@ -16,13 +18,15 @@
 	{
 		"code": "a11y-hidden",
 		"message": "A11y: <h2> element should not be hidden",
-		"loc": {
+		"start": {
 			"line": 2,
-			"column": 4
+			"column": 4,
+			"character": 14
 		},
 		"end": {
 			"line": 2,
-			"column": 15
+			"column": 15,
+			"character": 25
 		},
 		"pos": 14
 	}
diff --git a/test/validator/samples/a11y-html-has-lang/warnings.json b/test/validator/samples/a11y-html-has-lang/warnings.json
index 7189296725..963a2570db 100644
--- a/test/validator/samples/a11y-html-has-lang/warnings.json
+++ b/test/validator/samples/a11y-html-has-lang/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <html> element should have a lang attribute",
-		"loc": {
+		"start": {
 			"column": 0,
-			"line": 5
+			"line": 5,
+			"character": 82
 		},
 		"end": {
 			"line": 5,
-			"column": 13
+			"column": 13,
+			"character": 95
 		},
 		"pos": 82
 	}
diff --git a/test/validator/samples/a11y-iframe-has-title/warnings.json b/test/validator/samples/a11y-iframe-has-title/warnings.json
index 3dc5a6644a..d71bae1dae 100644
--- a/test/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/test/validator/samples/a11y-iframe-has-title/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <iframe> element should have a title attribute",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 29
+			"column": 29,
+			"character": 29
 		},
 		"pos": 0
 	}
diff --git a/test/validator/samples/a11y-no-access-key/warnings.json b/test/validator/samples/a11y-no-access-key/warnings.json
index 34cf8dcb4b..e7593b00fd 100644
--- a/test/validator/samples/a11y-no-access-key/warnings.json
+++ b/test/validator/samples/a11y-no-access-key/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "a11y-accesskey",
 	"message": "A11y: Avoid using accesskey",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	},
 	"pos": 5
 }]
\ No newline at end of file
diff --git a/test/validator/samples/a11y-no-autofocus/warnings.json b/test/validator/samples/a11y-no-autofocus/warnings.json
index b03d953c88..c4bf7d7a96 100644
--- a/test/validator/samples/a11y-no-autofocus/warnings.json
+++ b/test/validator/samples/a11y-no-autofocus/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "a11y-autofocus",
 	"message": "A11y: Avoid using autofocus",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 14
+		"column": 14,
+		"character": 14
 	},
 	"pos": 5
 }]
\ No newline at end of file
diff --git a/test/validator/samples/a11y-no-distracting-elements/warnings.json b/test/validator/samples/a11y-no-distracting-elements/warnings.json
index 515e15fab9..eb78dc9140 100644
--- a/test/validator/samples/a11y-no-distracting-elements/warnings.json
+++ b/test/validator/samples/a11y-no-distracting-elements/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-distracting-elements",
 		"message": "A11y: Avoid <marquee> elements",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 10
+			"column": 10,
+			"character": 10
 		},
 		"pos": 0
 	},
@@ -16,13 +18,15 @@
 	{
 		"code": "a11y-distracting-elements",
 		"message": "A11y: Avoid <blink> elements",
-		"loc": {
+		"start": {
 			"line": 2,
-			"column": 0
+			"column": 0,
+			"character": 11
 		},
 		"end": {
 			"line": 2,
-			"column": 8
+			"column": 8,
+			"character": 19
 		},
 		"pos": 11
 	}
diff --git a/test/validator/samples/a11y-not-on-components/warnings.json b/test/validator/samples/a11y-not-on-components/warnings.json
index 338f9ddfe1..58f114f554 100644
--- a/test/validator/samples/a11y-not-on-components/warnings.json
+++ b/test/validator/samples/a11y-not-on-components/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-autofocus",
 		"message": "A11y: Avoid using autofocus",
-		"loc": {
+		"start": {
 			"column": 8,
-			"line": 2
+			"line": 2,
+			"character": 29
 		},
 		"end": {
 			"line": 2,
-			"column": 17
+			"column": 17,
+			"character": 38
 		},
 		"pos": 29
 	}
diff --git a/test/validator/samples/a11y-scope/warnings.json b/test/validator/samples/a11y-scope/warnings.json
index 96a60dc410..192e0b764e 100644
--- a/test/validator/samples/a11y-scope/warnings.json
+++ b/test/validator/samples/a11y-scope/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-misplaced-scope",
 		"message": "A11y: The scope attribute should only be used with <th> elements",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 5
+			"column": 5,
+			"character": 5
 		},
 		"end": {
 			"line": 1,
-			"column": 10
+			"column": 10,
+			"character": 10
 		},
 		"pos": 5
 	}
diff --git a/test/validator/samples/a11y-tabindex-no-positive/warnings.json b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
index 0d674bf6bd..0695de4d7a 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/warnings.json
+++ b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
@@ -2,13 +2,15 @@
 	{
 		"code": "a11y-positive-tabindex",
 		"message": "A11y: avoid tabindex values above zero",
-		"loc": {
+		"start": {
 			"line": 3,
-			"column": 5
+			"column": 5,
+			"character": 46
 		},
 		"end": {
 			"line": 3,
-			"column": 17
+			"column": 17,
+			"character": 58
 		},
 		"pos": 46
 	}
diff --git a/test/validator/samples/action-invalid/errors.json b/test/validator/samples/action-invalid/errors.json
index b4e7f1bac1..b0ad0eb4e7 100644
--- a/test/validator/samples/action-invalid/errors.json
+++ b/test/validator/samples/action-invalid/errors.json
@@ -2,12 +2,14 @@
 	"code": "missing-action",
 	"message": "Missing action 'whatever'",
 	"pos": 5,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 17
+		"column": 17,
+		"character": 17
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/action-on-component/errors.json b/test/validator/samples/action-on-component/errors.json
index 3b190ace21..21ab463d8d 100644
--- a/test/validator/samples/action-on-component/errors.json
+++ b/test/validator/samples/action-on-component/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-action",
 	"message": "Actions can only be applied to DOM elements, not components",
 	"pos": 8,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 8
+		"column": 8,
+		"character": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/errors.json b/test/validator/samples/binding-input-checked/errors.json
index b135d58aa2..92daa1d625 100644
--- a/test/validator/samples/binding-input-checked/errors.json
+++ b/test/validator/samples/binding-input-checked/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'checked' binding can only be used with <input type=\"checkbox\">",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 7
+		"column": 7,
+		"character": 7
 	},
 	"end": {
 		"line": 1,
-		"column": 25
+		"column": 25,
+		"character": 25
 	},
 	"pos": 7
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-boolean/errors.json b/test/validator/samples/binding-input-type-boolean/errors.json
index eaaf0266ab..a2cdc84928 100644
--- a/test/validator/samples/binding-input-type-boolean/errors.json
+++ b/test/validator/samples/binding-input-type-boolean/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "missing-type",
 	"message": "'type' attribute must be specified",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 24
+		"column": 24,
+		"character": 24
 	},
 	"end": {
 		"line": 1,
-		"column": 28
+		"column": 28,
+		"character": 28
 	},
 	"pos": 24
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json
index 559c348ac6..57cb256fc2 100644
--- a/test/validator/samples/binding-input-type-dynamic/errors.json
+++ b/test/validator/samples/binding-input-type-dynamic/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-type",
 	"message": "'type' attribute cannot be dynamic if input uses two-way binding",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 24
+		"column": 24,
+		"character": 24
 	},
 	"end": {
 		"line": 1,
-		"column": 42
+		"column": 42,
+		"character": 42
 	},
 	"pos": 24
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid-on-element/errors.json b/test/validator/samples/binding-invalid-on-element/errors.json
index 5301203e86..40a9bd7ea2 100644
--- a/test/validator/samples/binding-invalid-on-element/errors.json
+++ b/test/validator/samples/binding-invalid-on-element/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-binding",
 	"message": "'value' is not a valid binding on <div> elements",
 	"pos": 5,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid/errors.json b/test/validator/samples/binding-invalid/errors.json
index fca76fdf79..2254286d3f 100644
--- a/test/validator/samples/binding-invalid/errors.json
+++ b/test/validator/samples/binding-invalid/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-binding",
 	"message": "'whatever' is not a valid binding",
 	"pos": 5,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	}
 }]
\ 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 e77ce0c615..7795c69b16 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/test/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "dynamic-multiple-attribute",
 	"message": "'multiple' attribute cannot be dynamic if select uses two-way binding",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 19
+		"column": 19,
+		"character": 19
 	},
 	"end": {
 		"line": 1,
-		"column": 29
+		"column": 29,
+		"character": 29
 	},
 	"pos": 19
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-cannot-be-called-state/errors.json b/test/validator/samples/component-cannot-be-called-state/errors.json
index 68787e7e7c..764a582c53 100644
--- a/test/validator/samples/component-cannot-be-called-state/errors.json
+++ b/test/validator/samples/component-cannot-be-called-state/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-name",
 	"message": "Component constructors cannot be called 'state' due to technical limitations",
 	"pos": 73,
-	"loc": {
+	"start": {
 		"line": 6,
-		"column": 3
+		"column": 3,
+		"character": 73
 	},
 	"end": {
 		"line": 6,
-		"column": 8
+		"column": 8,
+		"character": 78
 	}
 }]
diff --git a/test/validator/samples/component-slot-default-duplicate.skip/errors.json b/test/validator/samples/component-slot-default-duplicate.skip/errors.json
index 10a7789168..f60ddc8524 100644
--- a/test/validator/samples/component-slot-default-duplicate.skip/errors.json
+++ b/test/validator/samples/component-slot-default-duplicate.skip/errors.json
@@ -1,6 +1,6 @@
 [{
 	"message": "duplicate default <slot> element",
-	"loc": {
+	"start": {
 		"line": 2,
 		"column": 0
 	},
diff --git a/test/validator/samples/component-slot-default-reserved/errors.json b/test/validator/samples/component-slot-default-reserved/errors.json
index 3605cd6d3b..cefb00da8d 100644
--- a/test/validator/samples/component-slot-default-reserved/errors.json
+++ b/test/validator/samples/component-slot-default-reserved/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slot-name",
 	"message": "default is a reserved word — it cannot be used as a slot name",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 6
+		"column": 6,
+		"character": 6
 	},
 	"end": {
 		"line": 1,
-		"column": 20
+		"column": 20,
+		"character": 20
 	},
 	"pos": 6
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-dynamic-attribute/errors.json b/test/validator/samples/component-slot-dynamic-attribute/errors.json
index 2a470b24a5..5aac307fa3 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/test/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slot-attribute",
 	"message": "slot attribute cannot have a dynamic value",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 9
+		"column": 9,
+		"character": 18
 	},
 	"end": {
 		"line": 2,
-		"column": 21
+		"column": 21,
+		"character": 30
 	},
 	"pos": 18
 }]
\ 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 a34b79cb95..959aa87fd2 100644
--- a/test/validator/samples/component-slot-dynamic/errors.json
+++ b/test/validator/samples/component-slot-dynamic/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "dynamic-slot-name",
 	"message": "<slot> name cannot be dynamic",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 6
+		"column": 6,
+		"character": 6
 	},
 	"end": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	},
 	"pos": 6
 }]
\ 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 a0c00ae56e..97f88e4e60 100644
--- a/test/validator/samples/component-slot-each-block/errors.json
+++ b/test/validator/samples/component-slot-each-block/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slot-placement",
 	"message": "<slot> cannot be a child of an each-block",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 25
 	},
 	"end": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 25
 	},
 	"pos": 25
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slot-named-duplicate.skip/errors.json b/test/validator/samples/component-slot-named-duplicate.skip/errors.json
index 535a049c0d..8e5d995da6 100644
--- a/test/validator/samples/component-slot-named-duplicate.skip/errors.json
+++ b/test/validator/samples/component-slot-named-duplicate.skip/errors.json
@@ -1,6 +1,6 @@
 [{
 	"message": "duplicate 'foo' <slot> element",
-	"loc": {
+	"start": {
 		"line": 2,
 		"column": 6
 	},
diff --git a/test/validator/samples/component-slotted-each-block/errors.json b/test/validator/samples/component-slotted-each-block/errors.json
index e54e80e25d..3c96ba22ae 100644
--- a/test/validator/samples/component-slotted-each-block/errors.json
+++ b/test/validator/samples/component-slotted-each-block/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slotted-content",
 	"message": "Cannot place slotted elements inside an each-block",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 7
+		"column": 7,
+		"character": 41
 	},
 	"end": {
 		"line": 3,
-		"column": 17
+		"column": 17,
+		"character": 51
 	},
 	"pos": 41
 }]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-if-block/errors.json b/test/validator/samples/component-slotted-if-block/errors.json
index 2b55d88b2a..fe772659db 100644
--- a/test/validator/samples/component-slotted-if-block/errors.json
+++ b/test/validator/samples/component-slotted-if-block/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slotted-content",
 	"message": "Cannot place slotted elements inside an if-block",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 7
+		"column": 7,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 17
+		"column": 17,
+		"character": 39
 	},
 	"pos": 29
 }]
\ No newline at end of file
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 774d8834fd..fd0141a5c7 100644
--- a/test/validator/samples/computed-purity-check-no-this/errors.json
+++ b/test/validator/samples/computed-purity-check-no-this/errors.json
@@ -2,12 +2,14 @@
 	"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": 81,
-	"loc": {
+	"start": {
 		"line": 7,
-		"column": 4
+		"column": 4,
+		"character": 81
 	},
 	"end": {
 		"line": 7,
-		"column": 8
+		"column": 8,
+		"character": 85
 	}
 }]
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 e8d238ad5f..24df2efddf 100644
--- a/test/validator/samples/computed-purity-check-this-get/errors.json
+++ b/test/validator/samples/computed-purity-check-this-get/errors.json
@@ -2,12 +2,14 @@
 	"code": "impure-computed",
 	"message": "Cannot use this.get(...) — values must be passed into the function as arguments",
 	"pos": 71,
-	"loc": {
+	"start": {
 		"line": 7,
-		"column": 11
+		"column": 11,
+		"character": 71
 	},
 	"end": {
 		"line": 7,
-		"column": 28
+		"column": 28,
+		"character": 88
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/css-invalid-global-placement/errors.json b/test/validator/samples/css-invalid-global-placement/errors.json
index e6026b7c95..6e7e9be0ce 100644
--- a/test/validator/samples/css-invalid-global-placement/errors.json
+++ b/test/validator/samples/css-invalid-global-placement/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "css-invalid-global",
 	"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 6
+		"column": 6,
+		"character": 14
 	},
 	"end": {
 		"line": 2,
-		"column": 19
+		"column": 19,
+		"character": 27
 	},
 	"pos": 14
 }]
\ No newline at end of file
diff --git a/test/validator/samples/css-invalid-global/errors.json b/test/validator/samples/css-invalid-global/errors.json
index 6c6548dd80..63ed908342 100644
--- a/test/validator/samples/css-invalid-global/errors.json
+++ b/test/validator/samples/css-invalid-global/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "css-invalid-global",
 	"message": ":global(...) must be the first element in a compound selector",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 5
+		"column": 5,
+		"character": 13
 	},
 	"end": {
 		"line": 2,
-		"column": 18
+		"column": 18,
+		"character": 26
 	},
 	"pos": 13
 }]
\ No newline at end of file
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 dea69922d9..afe99ee219 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unexpected-reserved-word",
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 17
+		"column": 17,
+		"character": 17
 	},
 	"end": {
 		"line": 1,
-		"column": 17
+		"column": 17,
+		"character": 17
 	},
 	"pos": 17
 }]
\ 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 aaafbb5940..f997aa269f 100644
--- a/test/validator/samples/each-block-invalid-context/errors.json
+++ b/test/validator/samples/each-block-invalid-context/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unexpected-reserved-word",
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 16
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 16
+		"column": 16,
+		"character": 16
 	},
 	"pos": 16
 }]
\ 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 f6c5298c43..c26784952c 100644
--- a/test/validator/samples/empty-block-dev/warnings.json
+++ b/test/validator/samples/empty-block-dev/warnings.json
@@ -2,26 +2,30 @@
 	{
 		"code": "empty-block",
 		"message": "Empty block",
-		"loc": {
+		"start": {
 			"line": 1,
-			"column": 0
+			"column": 0,
+			"character": 0
 		},
 		"end": {
 			"line": 3,
-			"column": 7
+			"column": 7,
+			"character": 32
 		},
 		"pos": 0
 	},
 	{
 		"code": "empty-block",
 		"message": "Empty block",
-		"loc": {
+		"start": {
 			"line": 5,
-			"column": 0
+			"column": 0,
+			"character": 34
 		},
 		"end": {
 			"line": 5,
-			"column": 30
+			"column": 30,
+			"character": 64
 		},
 		"pos": 34
 	}
diff --git a/test/validator/samples/event-handler-ref-invalid/errors.json b/test/validator/samples/event-handler-ref-invalid/errors.json
index f2c80ca6a4..05c2fed01c 100644
--- a/test/validator/samples/event-handler-ref-invalid/errors.json
+++ b/test/validator/samples/event-handler-ref-invalid/errors.json
@@ -2,12 +2,14 @@
 	"code": "missing-ref",
 	"message": "'refs.inputx' does not exist (did you mean 'refs.input'?)",
 	"pos": 36,
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 18
+		"column": 18,
+		"character": 36
 	},
 	"end": {
 		"line": 2,
-		"column": 35
+		"column": 35,
+		"character": 53
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/export-default-duplicated/errors.json b/test/validator/samples/export-default-duplicated/errors.json
index dc0137c2c2..232e833a01 100644
--- a/test/validator/samples/export-default-duplicated/errors.json
+++ b/test/validator/samples/export-default-duplicated/errors.json
@@ -2,12 +2,14 @@
 	"code": "parse-error",
 	"message": "Duplicate export 'default'",
 	"pos": 37,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 8
+		"column": 8,
+		"character": 37
 	},
 	"end": {
 		"line": 3,
-		"column": 8
+		"column": 8,
+		"character": 37
 	}
 }]
diff --git a/test/validator/samples/export-default-must-be-object/errors.json b/test/validator/samples/export-default-must-be-object/errors.json
index 253922a038..a1171d5807 100644
--- a/test/validator/samples/export-default-must-be-object/errors.json
+++ b/test/validator/samples/export-default-must-be-object/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-default-export",
 	"message": "Default export must be an object literal",
 	"pos": 25,
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 16
+		"column": 16,
+		"character": 25
 	},
 	"end": {
 		"line": 2,
-		"column": 22
+		"column": 22,
+		"character": 31
 	}
 }]
diff --git a/test/validator/samples/helper-clash-context/warnings.json b/test/validator/samples/helper-clash-context/warnings.json
index 83b4826399..5fa69990a3 100644
--- a/test/validator/samples/helper-clash-context/warnings.json
+++ b/test/validator/samples/helper-clash-context/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "each-context-clash",
 	"message": "Context clashes with a helper. Rename one or the other to eliminate any ambiguity",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 17
+		"column": 17,
+		"character": 17
 	},
 	"end": {
 		"line": 1,
-		"column": 22
+		"column": 22,
+		"character": 22
 	},
 	"pos": 17
 }]
\ No newline at end of file
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 26af5f0e13..55048039d2 100644
--- a/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
+++ b/test/validator/samples/helper-purity-check-needs-arguments/warnings.json
@@ -2,12 +2,14 @@
 	"code": "impure-helper",
 	"message": "Helpers should be pure functions, with at least one argument",
 	"pos": 52,
-	"loc": {
+	"start": {
 		"line": 6,
-		"column": 3
+		"column": 3,
+		"character": 52
 	},
 	"end": {
 		"line": 8,
-		"column": 4
+		"column": 4,
+		"character": 91
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-no-this/errors.json b/test/validator/samples/helper-purity-check-no-this/errors.json
index 6a43b50404..549cd2f8c4 100644
--- a/test/validator/samples/helper-purity-check-no-this/errors.json
+++ b/test/validator/samples/helper-purity-check-no-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "impure-helper",
 	"message": "Helpers 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": 95,
-	"loc": {
+	"start": {
 		"line": 7,
-		"column": 4
+		"column": 4,
+		"character": 95
 	},
 	"end": {
 		"line": 7,
-		"column": 8
+		"column": 8,
+		"character": 99
 	}
 }]
\ No newline at end of file
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 5481fbf512..09402d70ee 100644
--- a/test/validator/samples/helper-purity-check-this-get/errors.json
+++ b/test/validator/samples/helper-purity-check-this-get/errors.json
@@ -2,12 +2,14 @@
 	"code": "impure-helper",
 	"message": "Cannot use this.get(...) — values must be passed into the helper function as arguments",
 	"pos": 72,
-	"loc": {
+	"start": {
 		"line": 7,
-		"column": 11
+		"column": 11,
+		"character": 72
 	},
 	"end": {
 		"line": 7,
-		"column": 28
+		"column": 28,
+		"character": 89
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/method-arrow-this/errors.json b/test/validator/samples/method-arrow-this/errors.json
index 62eccbe3fe..08a961405b 100644
--- a/test/validator/samples/method-arrow-this/errors.json
+++ b/test/validator/samples/method-arrow-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-method-value",
 	"message": "Method 'foo' should be a function expression, not an arrow function expression",
 	"pos": 79,
-	"loc": {
+	"start": {
 		"line": 6,
-		"column": 3
+		"column": 3,
+		"character": 79
 	},
 	"end": {
 		"line": 8,
-		"column": 4
+		"column": 4,
+		"character": 120
 	}
 }]
diff --git a/test/validator/samples/method-nonexistent-helper/warnings.json b/test/validator/samples/method-nonexistent-helper/warnings.json
index 7f612d3d7c..e1575d2bbd 100644
--- a/test/validator/samples/method-nonexistent-helper/warnings.json
+++ b/test/validator/samples/method-nonexistent-helper/warnings.json
@@ -2,12 +2,14 @@
 	"code": "invalid-callee",
 	"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": {
+	"start": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	},
 	"end": {
 		"line": 1,
-		"column": 23
+		"column": 23,
+		"character": 23
 	}
 }]
diff --git a/test/validator/samples/method-nonexistent/warnings.json b/test/validator/samples/method-nonexistent/warnings.json
index 7c7dc1aadd..324c9bd0d5 100644
--- a/test/validator/samples/method-nonexistent/warnings.json
+++ b/test/validator/samples/method-nonexistent/warnings.json
@@ -2,12 +2,14 @@
 	"code": "invalid-callee",
 	"message": "'foo' is an invalid callee (should be one of this.*, event.*, options.*, console.*, store.*, set, fire, destroy or bar)",
 	"pos": 18,
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	},
 	"end": {
 		"line": 1,
-		"column": 23
+		"column": 23,
+		"character": 23
 	}
 }]
diff --git a/test/validator/samples/missing-component/errors.json b/test/validator/samples/missing-component/errors.json
index b71ca231e1..01abf1e7ac 100644
--- a/test/validator/samples/missing-component/errors.json
+++ b/test/validator/samples/missing-component/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "missing-component",
 	"message": "Widget component is not defined",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 7
 	},
 	"end": {
 		"line": 2,
-		"column": 10
+		"column": 10,
+		"character": 16
 	},
 	"pos": 7
 }]
\ No newline at end of file
diff --git a/test/validator/samples/named-export/errors.json b/test/validator/samples/named-export/errors.json
index 0dad6200f9..705aac69c2 100644
--- a/test/validator/samples/named-export/errors.json
+++ b/test/validator/samples/named-export/errors.json
@@ -2,12 +2,14 @@
 	"code": "named-export",
 	"message": "A component can only have a default export",
 	"pos": 10,
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 1
+		"column": 1,
+		"character": 10
 	},
 	"end": {
 		"line": 2,
-		"column": 21
+		"column": 21,
+		"character": 30
 	}
 }]
diff --git a/test/validator/samples/namespace-invalid-unguessable/errors.json b/test/validator/samples/namespace-invalid-unguessable/errors.json
index e449e3fd9b..badab0d40e 100644
--- a/test/validator/samples/namespace-invalid-unguessable/errors.json
+++ b/test/validator/samples/namespace-invalid-unguessable/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'lol'",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 18
+		"column": 18,
+		"character": 45
 	}
 }]
diff --git a/test/validator/samples/namespace-invalid/errors.json b/test/validator/samples/namespace-invalid/errors.json
index f001950993..13a547bced 100644
--- a/test/validator/samples/namespace-invalid/errors.json
+++ b/test/validator/samples/namespace-invalid/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'http://www.w3.org/1999/svg' (did you mean 'http://www.w3.org/2000/svg'?)",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 41
+		"column": 41,
+		"character": 68
 	}
 }]
diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json
index 9c51e2adc5..4e001f6ed6 100644
--- a/test/validator/samples/namespace-non-literal/errors.json
+++ b/test/validator/samples/namespace-non-literal/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-namespace-property",
 	"message": "The 'namespace' property must be a string literal representing a valid namespace",
 	"pos": 79,
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 2
+		"column": 2,
+		"character": 79
 	},
 	"end": {
 		"line": 5,
-		"column": 11
+		"column": 11,
+		"character": 88
 	}
 }]
diff --git a/test/validator/samples/non-object-literal-components/errors.json b/test/validator/samples/non-object-literal-components/errors.json
index 53d6d9a0d5..2cfa0a9b19 100644
--- a/test/validator/samples/non-object-literal-components/errors.json
+++ b/test/validator/samples/non-object-literal-components/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-components-property",
 	"message": "The 'components' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 37
+		"column": 37,
+		"character": 64
 	},
 	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-events/errors.json b/test/validator/samples/non-object-literal-events/errors.json
index ef9956051d..be93ead597 100644
--- a/test/validator/samples/non-object-literal-events/errors.json
+++ b/test/validator/samples/non-object-literal-events/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-events-property",
 	"message": "The 'events' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 33
+		"column": 33,
+		"character": 60
 	},
 	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-helpers/errors.json b/test/validator/samples/non-object-literal-helpers/errors.json
index cdd7310327..0fd7bf0b06 100644
--- a/test/validator/samples/non-object-literal-helpers/errors.json
+++ b/test/validator/samples/non-object-literal-helpers/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-helpers-property",
 	"message": "The 'helpers' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 34
+		"column": 34,
+		"character": 61
 	},
 	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-methods/errors.json b/test/validator/samples/non-object-literal-methods/errors.json
index 731ce820f7..84a42c6f94 100644
--- a/test/validator/samples/non-object-literal-methods/errors.json
+++ b/test/validator/samples/non-object-literal-methods/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-methods-property",
 	"message": "The 'methods' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 34
+		"column": 34,
+		"character": 61
 	},
 	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-transitions/errors.json b/test/validator/samples/non-object-literal-transitions/errors.json
index 791594f66e..9e4e04edb6 100644
--- a/test/validator/samples/non-object-literal-transitions/errors.json
+++ b/test/validator/samples/non-object-literal-transitions/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-transitions-property",
 	"message": "The 'transitions' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 3,
-		"column": 38
+		"column": 38,
+		"character": 65
 	},
 	"pos": 29
 }]
\ No newline at end of file
diff --git a/test/validator/samples/oncreate-arrow-this/errors.json b/test/validator/samples/oncreate-arrow-this/errors.json
index 469298dc4e..b2a423e047 100644
--- a/test/validator/samples/oncreate-arrow-this/errors.json
+++ b/test/validator/samples/oncreate-arrow-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-oncreate-property",
 	"message": "'oncreate' should be a function expression, not an arrow function expression",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 5,
-		"column": 3
+		"column": 3,
+		"character": 73
 	}
 }]
diff --git a/test/validator/samples/ondestroy-arrow-this/errors.json b/test/validator/samples/ondestroy-arrow-this/errors.json
index 80d227e1cc..c2f7f7ef4b 100644
--- a/test/validator/samples/ondestroy-arrow-this/errors.json
+++ b/test/validator/samples/ondestroy-arrow-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-ondestroy-property",
 	"message": "'ondestroy' should be a function expression, not an arrow function expression",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 5,
-		"column": 3
+		"column": 3,
+		"character": 74
 	}
 }]
diff --git a/test/validator/samples/onstate-arrow-this/errors.json b/test/validator/samples/onstate-arrow-this/errors.json
index c1788d56de..3d9f5451d6 100644
--- a/test/validator/samples/onstate-arrow-this/errors.json
+++ b/test/validator/samples/onstate-arrow-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-onstate-property",
 	"message": "'onstate' should be a function expression, not an arrow function expression",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 5,
-		"column": 3
+		"column": 3,
+		"character": 72
 	}
 }]
diff --git a/test/validator/samples/onupdate-arrow-this/errors.json b/test/validator/samples/onupdate-arrow-this/errors.json
index b4b1b8231e..8605fc46b8 100644
--- a/test/validator/samples/onupdate-arrow-this/errors.json
+++ b/test/validator/samples/onupdate-arrow-this/errors.json
@@ -2,12 +2,14 @@
 	"code": "invalid-onupdate-property",
 	"message": "'onupdate' should be a function expression, not an arrow function expression",
 	"pos": 29,
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 2
+		"column": 2,
+		"character": 29
 	},
 	"end": {
 		"line": 5,
-		"column": 3
+		"column": 3,
+		"character": 73
 	}
 }]
diff --git a/test/validator/samples/properties-components-must-be-capitalised/errors.json b/test/validator/samples/properties-components-must-be-capitalised/errors.json
index c171254888..3ceeea6f00 100644
--- a/test/validator/samples/properties-components-must-be-capitalised/errors.json
+++ b/test/validator/samples/properties-components-must-be-capitalised/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "component-lowercase",
 	"message": "Component names must be capitalised",
-	"loc": {
+	"start": {
 		"line": 6,
-		"column": 3
+		"column": 3,
+		"character": 59
 	},
 	"end": {
 		"line": 6,
-		"column": 6
+		"column": 6,
+		"character": 62
 	},
 	"pos": 59
 }]
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 0fa8601572..8f771a57d6 100644
--- a/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
+++ b/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
@@ -2,13 +2,15 @@
 	"code": "invalid-computed-name",
 	"message":
 		"Computed property name 'new' is invalid — cannot be a JavaScript reserved word",
-	"loc": {
+	"start": {
 		"line": 9,
-		"column": 3
+		"column": 3,
+		"character": 87
 	},
 	"end": {
 		"line": 9,
-		"column": 6
+		"column": 6,
+		"character": 90
 	},
 	"pos": 87
 }]
diff --git a/test/validator/samples/properties-computed-must-be-an-object/errors.json b/test/validator/samples/properties-computed-must-be-an-object/errors.json
index 764b911fb6..b964b6b8bc 100644
--- a/test/validator/samples/properties-computed-must-be-an-object/errors.json
+++ b/test/validator/samples/properties-computed-must-be-an-object/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-computed-property",
 	"message": "The 'computed' property must be an object literal",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 2
+		"column": 2,
+		"character": 42
 	},
 	"end": {
 		"line": 5,
-		"column": 23
+		"column": 23,
+		"character": 63
 	},
 	"pos": 42
 }]
diff --git a/test/validator/samples/properties-computed-must-be-functions/errors.json b/test/validator/samples/properties-computed-must-be-functions/errors.json
index 5db219b222..40661ca5f3 100644
--- a/test/validator/samples/properties-computed-must-be-functions/errors.json
+++ b/test/validator/samples/properties-computed-must-be-functions/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-computed-value",
 	"message": "Computed properties can be function expressions or arrow function expressions",
-	"loc": {
+	"start": {
 		"line": 6,
-		"column": 8
+		"column": 8,
+		"character": 62
 	},
 	"end": {
 		"line": 6,
-		"column": 20
+		"column": 20,
+		"character": 74
 	},
 	"pos": 62
 }]
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 8759767afd..d52061b79d 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
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-computed-name",
 	"message": "Computed property name 'with-hyphen' is invalid — must be a valid identifier such as with_hyphen",
-	"loc": {
+	"start": {
 		"line": 9,
-		"column": 3
+		"column": 3,
+		"character": 87
 	},
 	"end": {
 		"line": 9,
-		"column": 16
+		"column": 16,
+		"character": 100
 	},
 	"pos": 87
 }]
diff --git a/test/validator/samples/properties-computed-values-needs-arguments/errors.json b/test/validator/samples/properties-computed-values-needs-arguments/errors.json
index 20d33b1fe9..6e91ecf32c 100644
--- a/test/validator/samples/properties-computed-values-needs-arguments/errors.json
+++ b/test/validator/samples/properties-computed-values-needs-arguments/errors.json
@@ -2,12 +2,14 @@
 	"code": "impure-computed",
 	"message": "A computed value must depend on at least one property",
 	"pos": 49,
-	"loc": {
+	"start": {
 		"line": 4,
-		"column": 8
+		"column": 8,
+		"character": 49
 	},
 	"end": {
 		"line": 4,
-		"column": 16
+		"column": 16,
+		"character": 57
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/properties-data-must-be-function/errors.json b/test/validator/samples/properties-data-must-be-function/errors.json
index 68fe8eafb9..d59826c49d 100644
--- a/test/validator/samples/properties-data-must-be-function/errors.json
+++ b/test/validator/samples/properties-data-must-be-function/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-data-property",
 	"message": "'data' must be a function",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 8
+		"column": 8,
+		"character": 48
 	},
 	"end": {
 		"line": 7,
-		"column": 3
+		"column": 3,
+		"character": 64
 	},
 	"pos": 48
 }]
diff --git a/test/validator/samples/properties-duplicated/errors.json b/test/validator/samples/properties-duplicated/errors.json
index 3b0acf6a12..08da6cc999 100644
--- a/test/validator/samples/properties-duplicated/errors.json
+++ b/test/validator/samples/properties-duplicated/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-property",
 	"message": "Duplicate property 'methods'",
-	"loc": {
+	"start": {
 		"line": 9,
-		"column": 2
+		"column": 2,
+		"character": 74
 	},
 	"end": {
 		"line": 11,
-		"column": 3
+		"column": 3,
+		"character": 101
 	},
 	"pos": 74
 }]
diff --git a/test/validator/samples/properties-methods-getters-setters/errors.json b/test/validator/samples/properties-methods-getters-setters/errors.json
index 5cde6051e4..d86fedc83c 100644
--- a/test/validator/samples/properties-methods-getters-setters/errors.json
+++ b/test/validator/samples/properties-methods-getters-setters/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "illegal-accessor",
 	"message": "Methods cannot use getters and setters",
-	"loc": {
+	"start": {
 		"line": 4,
-		"column": 3
+		"column": 3,
+		"character": 43
 	},
 	"end": {
 		"line": 6,
-		"column": 4
+		"column": 4,
+		"character": 61
 	},
 	"pos": 43
 }]
diff --git a/test/validator/samples/properties-props-must-be-an-array/errors.json b/test/validator/samples/properties-props-must-be-an-array/errors.json
index cd5be4fa46..a9f30e3e05 100644
--- a/test/validator/samples/properties-props-must-be-an-array/errors.json
+++ b/test/validator/samples/properties-props-must-be-an-array/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-props-property",
 	"message": "'props' must be an array expression, if specified",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 9
+		"column": 9,
+		"character": 49
 	},
 	"end": {
 		"line": 5,
-		"column": 11
+		"column": 11,
+		"character": 51
 	},
 	"pos": 49
 }]
diff --git a/test/validator/samples/properties-props-must-be-array-of-strings/errors.json b/test/validator/samples/properties-props-must-be-array-of-strings/errors.json
index 0f9b383343..02117119d8 100644
--- a/test/validator/samples/properties-props-must-be-array-of-strings/errors.json
+++ b/test/validator/samples/properties-props-must-be-array-of-strings/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-props-property",
 	"message": "'props' must be an array of string literals",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 10
+		"column": 10,
+		"character": 50
 	},
 	"end": {
 		"line": 5,
-		"column": 12
+		"column": 12,
+		"character": 52
 	},
 	"pos": 50
 }]
diff --git a/test/validator/samples/properties-unexpected-b/errors.json b/test/validator/samples/properties-unexpected-b/errors.json
index 45694450a8..aaa2c80cc7 100644
--- a/test/validator/samples/properties-unexpected-b/errors.json
+++ b/test/validator/samples/properties-unexpected-b/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unexpected-property",
 	"message": "Unexpected property 'doSomething' (did you mean to include it in 'methods'?)",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 2
+		"column": 2,
+		"character": 42
 	},
 	"end": {
 		"line": 7,
-		"column": 3
+		"column": 3,
+		"character": 81
 	},
 	"pos": 42
 }]
diff --git a/test/validator/samples/properties-unexpected/errors.json b/test/validator/samples/properties-unexpected/errors.json
index 5bc2a4b416..1ea3517e45 100644
--- a/test/validator/samples/properties-unexpected/errors.json
+++ b/test/validator/samples/properties-unexpected/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unexpected-property",
 	"message": "Unexpected property 'dada' (did you mean 'data'?)",
-	"loc": {
+	"start": {
 		"line": 5,
-		"column": 2
+		"column": 2,
+		"character": 42
 	},
 	"end": {
 		"line": 9,
-		"column": 3
+		"column": 3,
+		"character": 84
 	},
 	"pos": 42
 }]
diff --git a/test/validator/samples/slot-attribute-invalid/errors.json b/test/validator/samples/slot-attribute-invalid/errors.json
index 5c56bed158..fc01fa9792 100644
--- a/test/validator/samples/slot-attribute-invalid/errors.json
+++ b/test/validator/samples/slot-attribute-invalid/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-slotted-content",
 	"message": "Element with a slot='...' attribute must be a descendant of a component or custom element",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"pos": 5
 }]
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 8a43c938e6..dce19a77cf 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "missing-namespace",
 	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 0
+		"column": 0,
+		"character": 0
 	},
 	"end": {
 		"line": 1,
-		"column": 57
+		"column": 57,
+		"character": 57
 	},
 	"pos": 0
 }]
diff --git a/test/validator/samples/tag-invalid/errors.json b/test/validator/samples/tag-invalid/errors.json
index 9dc696463c..842d98df31 100644
--- a/test/validator/samples/tag-invalid/errors.json
+++ b/test/validator/samples/tag-invalid/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-tag-property",
 	"message": "tag name must be two or more words joined by the '-' character",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 7
+		"column": 7,
+		"character": 34
 	},
 	"end": {
 		"line": 3,
-		"column": 16
+		"column": 16,
+		"character": 43
 	},
 	"pos": 34
 }]
\ No newline at end of file
diff --git a/test/validator/samples/tag-non-string/errors.json b/test/validator/samples/tag-non-string/errors.json
index 126bad22df..b55aa83cb4 100644
--- a/test/validator/samples/tag-non-string/errors.json
+++ b/test/validator/samples/tag-non-string/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-tag-property",
 	"message": "'tag' must be a string literal",
-	"loc": {
+	"start": {
 		"line": 3,
-		"column": 7
+		"column": 7,
+		"character": 34
 	},
 	"end": {
 		"line": 3,
-		"column": 9
+		"column": 9,
+		"character": 36
 	},
 	"pos": 34
 }]
\ No newline at end of file
diff --git a/test/validator/samples/textarea-value-children/errors.json b/test/validator/samples/textarea-value-children/errors.json
index bf603f7159..551071e6d1 100644
--- a/test/validator/samples/textarea-value-children/errors.json
+++ b/test/validator/samples/textarea-value-children/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "textarea-duplicate-value",
 	"message": "A <textarea> can have either a value attribute or (equivalently) child content, but not both",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 10
+		"column": 10,
+		"character": 10
 	},
 	"end": {
 		"line": 1,
-		"column": 23
+		"column": 23,
+		"character": 23
 	},
 	"pos": 10
 }]
\ 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 84b421c093..4e9f133bd4 100644
--- a/test/validator/samples/title-no-attributes/errors.json
+++ b/test/validator/samples/title-no-attributes/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "illegal-attribute",
 	"message": "<title> cannot have attributes",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 8
+		"column": 8,
+		"character": 22
 	},
 	"end": {
 		"line": 2,
-		"column": 25
+		"column": 25,
+		"character": 39
 	},
 	"pos": 22
 }]
\ 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 c304e1b8e8..9b10d700eb 100644
--- a/test/validator/samples/title-no-children/errors.json
+++ b/test/validator/samples/title-no-children/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "illegal-structure",
 	"message": "<title> can only contain text and {{tags}}",
-	"loc": {
+	"start": {
 		"line": 2,
-		"column": 11
+		"column": 11,
+		"character": 25
 	},
 	"end": {
 		"line": 2,
-		"column": 35
+		"column": 35,
+		"character": 49
 	},
 	"pos": 25
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in-transition/errors.json b/test/validator/samples/transition-duplicate-in-transition/errors.json
index b3e90c0fa1..bb52635630 100644
--- a/test/validator/samples/transition-duplicate-in-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-in-transition/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element cannot have both an 'in' directive and a 'transition' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 12
+		"column": 12,
+		"character": 12
 	},
 	"end": {
 		"line": 1,
-		"column": 26
+		"column": 26,
+		"character": 26
 	},
 	"pos": 12
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in/errors.json b/test/validator/samples/transition-duplicate-in/errors.json
index 3d48443486..b989855594 100644
--- a/test/validator/samples/transition-duplicate-in/errors.json
+++ b/test/validator/samples/transition-duplicate-in/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'in' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 12
+		"column": 12,
+		"character": 12
 	},
 	"end": {
 		"line": 1,
-		"column": 18
+		"column": 18,
+		"character": 18
 	},
 	"pos": 12
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out-transition/errors.json b/test/validator/samples/transition-duplicate-out-transition/errors.json
index 5955783ac9..ee8c2aa8a6 100644
--- a/test/validator/samples/transition-duplicate-out-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-out-transition/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element cannot have both an 'out' directive and a 'transition' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 13
+		"column": 13,
+		"character": 13
 	},
 	"end": {
 		"line": 1,
-		"column": 27
+		"column": 27,
+		"character": 27
 	},
 	"pos": 13
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out/errors.json b/test/validator/samples/transition-duplicate-out/errors.json
index 529256d965..db69c741c6 100644
--- a/test/validator/samples/transition-duplicate-out/errors.json
+++ b/test/validator/samples/transition-duplicate-out/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'out' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 13
+		"column": 13,
+		"character": 13
 	},
 	"end": {
 		"line": 1,
-		"column": 20
+		"column": 20,
+		"character": 20
 	},
 	"pos": 13
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-in/errors.json b/test/validator/samples/transition-duplicate-transition-in/errors.json
index ce39d08e7e..5f03fe331f 100644
--- a/test/validator/samples/transition-duplicate-transition-in/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-in/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element cannot have both a 'transition' directive and an 'in' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 20
+		"column": 20,
+		"character": 20
 	},
 	"end": {
 		"line": 1,
-		"column": 26
+		"column": 26,
+		"character": 26
 	},
 	"pos": 20
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-out/errors.json b/test/validator/samples/transition-duplicate-transition-out/errors.json
index 59cde4fbd0..5f3b73b35a 100644
--- a/test/validator/samples/transition-duplicate-transition-out/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-out/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element cannot have both a 'transition' directive and an 'out' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 20
+		"column": 20,
+		"character": 20
 	},
 	"end": {
 		"line": 1,
-		"column": 27
+		"column": 27,
+		"character": 27
 	},
 	"pos": 20
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition/errors.json b/test/validator/samples/transition-duplicate-transition/errors.json
index 7510d13b8d..b855f2e63f 100644
--- a/test/validator/samples/transition-duplicate-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-transition/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "duplicate-transition",
 	"message": "An element can only have one 'transition' directive",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 20
+		"column": 20,
+		"character": 20
 	},
 	"end": {
 		"line": 1,
-		"column": 34
+		"column": 34,
+		"character": 34
 	},
 	"pos": 20
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-missing/errors.json b/test/validator/samples/transition-missing/errors.json
index f647937245..1261cc4bec 100644
--- a/test/validator/samples/transition-missing/errors.json
+++ b/test/validator/samples/transition-missing/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "missing-transition",
 	"message": "Missing transition 'foo'",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 5
+		"column": 5,
+		"character": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 11
+		"column": 11,
+		"character": 11
 	},
 	"pos": 5
 }]
\ No newline at end of file
diff --git a/test/validator/samples/transition-on-component/errors.json b/test/validator/samples/transition-on-component/errors.json
index 8e2769055f..1a3fb465e3 100644
--- a/test/validator/samples/transition-on-component/errors.json
+++ b/test/validator/samples/transition-on-component/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-transition",
 	"message": "Transitions can only be applied to DOM elements, not components",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 8
+		"column": 8,
+		"character": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 14
+		"column": 14,
+		"character": 14
 	},
 	"pos": 8
 }]
\ No newline at end of file
diff --git a/test/validator/samples/unused-components/warnings.json b/test/validator/samples/unused-components/warnings.json
index 93d1c48d68..51a15dec37 100644
--- a/test/validator/samples/unused-components/warnings.json
+++ b/test/validator/samples/unused-components/warnings.json
@@ -2,26 +2,30 @@
 	{
 		"code": "unused-component",
 		"message": "The 'Foo' component is unused",
-		"loc": {
+		"start": {
 			"line": 7,
-			"column": 3
+			"column": 3,
+			"character": 109
 		},
 		"end": {
 			"line": 7,
-			"column": 6
+			"column": 6,
+			"character": 112
 		},
 		"pos": 109
 	},
 	{
 		"code": "unused-component",
 		"message": "The 'Bar' component is unused",
-		"loc": {
+		"start": {
 			"line": 8,
-			"column": 3
+			"column": 3,
+			"character": 117
 		},
 		"end": {
 			"line": 8,
-			"column": 6
+			"column": 6,
+			"character": 120
 		},
 		"pos": 117
 	}
diff --git a/test/validator/samples/unused-event/warnings.json b/test/validator/samples/unused-event/warnings.json
index 02c2db748c..7a8f2714ad 100644
--- a/test/validator/samples/unused-event/warnings.json
+++ b/test/validator/samples/unused-event/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unused-event",
 	"message": "The 'drag' event definition is unused",
-	"loc": {
+	"start": {
 		"line": 4,
-		"column": 3
+		"column": 3,
+		"character": 42
 	},
 	"end": {
 		"line": 6,
-		"column": 4
+		"column": 4,
+		"character": 106
 	},
 	"pos": 42
 }]
diff --git a/test/validator/samples/unused-helper.skip/warnings.json b/test/validator/samples/unused-helper.skip/warnings.json
index fda70ebc0c..08b91c241e 100644
--- a/test/validator/samples/unused-helper.skip/warnings.json
+++ b/test/validator/samples/unused-helper.skip/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"message": "The 'uppercase' helper is unused",
-	"loc": {
+	"start": {
 		"line": 4,
 		"column": 3
 	},
diff --git a/test/validator/samples/unused-transition/warnings.json b/test/validator/samples/unused-transition/warnings.json
index 3547db4200..6e53240481 100644
--- a/test/validator/samples/unused-transition/warnings.json
+++ b/test/validator/samples/unused-transition/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "unused-transition",
 	"message": "The 'spin' transition is unused",
-	"loc": {
+	"start": {
 		"line": 4,
-		"column": 3
+		"column": 3,
+		"character": 47
 	},
 	"end": {
 		"line": 6,
-		"column": 4
+		"column": 4,
+		"character": 99
 	},
 	"pos": 47
 }]
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/errors.json b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
index e5bc0c7d34..c348a48811 100644
--- a/test/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'innerwidth' is not a valid binding on <svelte:window> (did you mean 'innerWidth'?)",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 34
+		"column": 34,
+		"character": 34
 	},
 	"pos": 15
 }]
\ 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 49b2fa517f..7a42e62b9a 100644
--- a/test/validator/samples/window-binding-invalid-value/errors.json
+++ b/test/validator/samples/window-binding-invalid-value/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "Bindings on <svelte:window> must be to top-level properties, e.g. 'baz' rather than 'foo.bar.baz'",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 32
+		"column": 32,
+		"character": 32
 	},
 	"end": {
 		"line": 1,
-		"column": 43
+		"column": 43,
+		"character": 43
 	},
 	"pos": 32
 }]
\ 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 c340fe3f7d..3274188662 100644
--- a/test/validator/samples/window-binding-invalid-width/errors.json
+++ b/test/validator/samples/window-binding-invalid-width/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'width' is not a valid binding on <svelte:window> (did you mean 'innerWidth'?)",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 29
+		"column": 29,
+		"character": 29
 	},
 	"pos": 15
 }]
\ 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 7d5f049b79..b8cae81bf3 100644
--- a/test/validator/samples/window-binding-invalid/errors.json
+++ b/test/validator/samples/window-binding-invalid/errors.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'potato' is not a valid binding on <svelte:window> — valid bindings are innerWidth, innerHeight, outerWidth, outerHeight, scrollX, scrollY or online",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 15
+		"column": 15,
+		"character": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 32
+		"column": 32,
+		"character": 32
 	},
 	"pos": 15
 }]
\ 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 47eda14472..e88f3839f3 100644
--- a/test/validator/samples/window-event-invalid/warnings.json
+++ b/test/validator/samples/window-event-invalid/warnings.json
@@ -1,13 +1,15 @@
 [{
 	"code": "invalid-callee",
 	"message": "'resize' is an invalid callee (should be one of this.*, event.*, options.*, console.*, store.*, set, fire or destroy)",
-	"loc": {
+	"start": {
 		"line": 1,
-		"column": 26
+		"column": 26,
+		"character": 26
 	},
 	"end": {
 		"line": 1,
-		"column": 34
+		"column": 34,
+		"character": 34
 	},
 	"pos": 26
 }]
diff --git a/yarn.lock b/yarn.lock
index 515c6b6ec6..5d53465a51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1911,7 +1911,7 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-locate-character@^2.0.0:
+locate-character@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"