From 68bc5ee8b565dca792d196184d4396530813ecc8 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sat, 2 Mar 2019 18:07:15 -0500
Subject: [PATCH] refactor message stuff

---
 .../components/Repl/Input/ModuleEditor.svelte | 49 +-----------
 site/src/components/Repl/Message.svelte       | 80 +++++++++++++++++++
 site/src/components/Repl/Output/Viewer.svelte | 46 ++++-------
 site/src/components/Repl/Output/index.svelte  | 17 ++--
 site/src/components/Repl/SplitPane.svelte     |  1 +
 site/src/components/Repl/index.svelte         | 42 ----------
 6 files changed, 106 insertions(+), 129 deletions(-)
 create mode 100644 site/src/components/Repl/Message.svelte

diff --git a/site/src/components/Repl/Input/ModuleEditor.svelte b/site/src/components/Repl/Input/ModuleEditor.svelte
index a3e66c0f7a..e7a9dc9059 100644
--- a/site/src/components/Repl/Input/ModuleEditor.svelte
+++ b/site/src/components/Repl/Input/ModuleEditor.svelte
@@ -1,6 +1,7 @@
 <script>
 	import { getContext } from 'svelte';
 	import CodeMirror from '../CodeMirror.svelte';
+	import Message from '../Message.svelte';
 
 	const { selected, handle_change, navigate } = getContext('REPL');
 
@@ -36,42 +37,6 @@
 		flex: 1;
 	}
 
-	.info p {
-		position: relative;
-		color: white;
-		padding: 1.2rem 1.6rem 1.2rem 4.4rem;
-		font: 400 1.2rem/1.7 var(--font);
-		margin: 0;
-		border-top: 1px solid white;
-	}
-
-	.navigable {
-		cursor: pointer;
-	}
-
-	.info p::before {
-		content: '!';
-		position: absolute;
-		left: 1.2rem;
-		top: 1.1rem;
-		width: 1rem;
-		height: 1rem;
-		text-align: center;
-		line-height: 1;
-		padding: .4rem;
-		border-radius: 50%;
-		color: white;
-		border: .2rem solid white;
-	}
-
-	.error {
-		background-color: #da106e;
-	}
-
-	.warning {
-		background-color: #e47e0a;
-	}
-
 	@media (min-width: 600px) {
 		.editor-wrapper.columns {
 			/* make it easier to interact with scrollbar */
@@ -96,18 +61,10 @@
 
 	<div class="info">
 		{#if error}
-			<p
-				class="error"
-				class:navigable={error.filename}
-				on:click="{() => navigate(error)}"
-			>{error.message}</p>
+			<Message kind="error" details={error} filename="{$selected.name}.{$selected.type}"/>
 		{:else if warnings.length > 0}
 			{#each warnings as warning}
-				<p
-					class="warning"
-					class:navigable={warning.filename}
-					on:click="{() => navigate(warning)}"
-				>{message(warning)}</p>
+				<Message kind="warning" details={warning} filename="{$selected.name}.{$selected.type}"/>
 			{/each}
 		{/if}
 	</div>
diff --git a/site/src/components/Repl/Message.svelte b/site/src/components/Repl/Message.svelte
new file mode 100644
index 0000000000..c8f2183827
--- /dev/null
+++ b/site/src/components/Repl/Message.svelte
@@ -0,0 +1,80 @@
+<script>
+	import { getContext } from 'svelte';
+
+	const { navigate } = getContext('REPL');
+
+	export let kind;
+	export let details;
+	export let filename;
+
+	function message(details) {
+		let str = details.message || '[missing message]';
+
+		let loc = [];
+
+		if (details.filename && details.filename !== filename) {
+			loc.push(details.filename);
+		}
+
+		if (details.start) loc.push(details.start.line, details.start.column);
+
+		return str + (loc.length ? ` (${loc.join(':')})` : ``);
+	};
+</script>
+
+<style>
+	.message {
+		position: relative;
+		color: white;
+		padding: 1.2rem 1.6rem 1.2rem 4.4rem;
+		font: 400 1.2rem/1.7 var(--font);
+		margin: 0;
+		border-top: 1px solid white;
+	}
+
+	.navigable {
+		cursor: pointer;
+	}
+
+	.message::before {
+		content: '!';
+		position: absolute;
+		left: 1.2rem;
+		top: 1.1rem;
+		width: 1rem;
+		height: 1rem;
+		text-align: center;
+		line-height: 1;
+		padding: .4rem;
+		border-radius: 50%;
+		color: white;
+		border: .2rem solid white;
+	}
+
+	p {
+		margin: 0;
+	}
+
+	.info {
+		background-color: var(--second);
+	}
+
+	.error {
+		background-color: #da106e;
+	}
+
+	.warning {
+		background-color: #e47e0a;
+	}
+</style>
+
+<div class="message {kind}">
+	{#if details}
+		<p
+			class:navigable={details.filename}
+			on:click="{() => navigate(details)}"
+		>{message(details)}</p>
+	{:else}
+		<slot></slot>
+	{/if}
+</div>
\ No newline at end of file
diff --git a/site/src/components/Repl/Output/Viewer.svelte b/site/src/components/Repl/Output/Viewer.svelte
index 010600e5b0..b9b0e60070 100644
--- a/site/src/components/Repl/Output/Viewer.svelte
+++ b/site/src/components/Repl/Output/Viewer.svelte
@@ -2,6 +2,7 @@
 	import { onMount, createEventDispatcher, getContext } from 'svelte';
 	import getLocationFromStack from './getLocationFromStack.js';
 	import ReplProxy from './replProxy.js';
+	import Message from '../Message.svelte';
 	import { decode } from 'sourcemap-codec';
 
 	const dispatch = createEventDispatcher();
@@ -100,7 +101,7 @@
 						const loc = getLocationFromStack(e.stack, $bundle.ssr.map);
 						if (loc) {
 							e.filename = loc.source;
-							e.loc = { line: loc.line, column: loc.column };
+							e.start = { line: loc.line, column: loc.column };
 						}
 
 						error = e;
@@ -197,8 +198,10 @@
 
 <style>
 	.iframe-container {
+		position: absolute;
 		background-color: white;
 		border: none;
+		width: 100%;
 		height: 100%;
 	}
 
@@ -217,11 +220,8 @@
 
 	.overlay {
 		position: absolute;
-		top: 0;
+		bottom: 0;
 		width: 100%;
-		height: 100%;
-		padding: 1em;
-		pointer-events: none;
 	}
 
 	.overlay p {
@@ -258,29 +258,15 @@
 			</body>
 		</html>
 	'></iframe>
-</div>
-
-<div class="overlay">
-	{#if error}
-		<p class="error message">
-			{#if error.loc}
-			<strong>
-				{#if error.filename}
-					<span class="filename" on:click="{() => navigate({ filename: error.filename })}">{error.filename}</span>
-				{/if}
-
-				({error.loc.line}:{error.loc.column})
-			</strong>
-			{/if}
-
-			{error.message}
-		</p>
-	{:else if pending}
-		<div class="pending" on:click={run}>
-			<button class="bg-second white">Click to run</button>
-		</div>
-	{:else if pendingImports}
-		<p class="info message">loading {pendingImports} {pendingImports === 1 ? 'dependency' : 'dependencies'} from
-		https://bundle.run</p>
-	{/if}
+
+	<div class="overlay">
+		{#if error}
+			<Message kind="error" details={error}/>
+		{:else if !$bundle}
+			<Message kind="info">loading Svelte compiler...</Message>
+		{:else if pendingImports}
+			<Message kind="info">loading {pendingImports} {pendingImports === 1 ? 'dependency' : 'dependencies'} from
+			https://bundle.run</Message>
+		{/if}
+	</div>
 </div>
\ No newline at end of file
diff --git a/site/src/components/Repl/Output/index.svelte b/site/src/components/Repl/Output/index.svelte
index ec138897d5..5d8fa4be45 100644
--- a/site/src/components/Repl/Output/index.svelte
+++ b/site/src/components/Repl/Output/index.svelte
@@ -116,17 +116,12 @@
 {#if view === 'result'}
 	<SplitPane type="vertical" pos={67} fixed={!show_props} fixed_pos={100}>
 		<div slot="a">
-			{#if $bundle}
-				<Viewer
-					bind:this={viewer}
-					{props}
-					bind:error={runtimeError}
-					on:binding="{e => setPropFromViewer(e.detail.prop, e.detail.value)}"
-				/>
-			{:else}
-				<!-- TODO componentise this -->
-				<p class="loading message">loading Svelte compiler...</p>
-			{/if}
+			<Viewer
+				bind:this={viewer}
+				{props}
+				bind:error={runtimeError}
+				on:binding="{e => setPropFromViewer(e.detail.prop, e.detail.value)}"
+			/>
 		</div>
 
 		<section slot="b">
diff --git a/site/src/components/Repl/SplitPane.svelte b/site/src/components/Repl/SplitPane.svelte
index a79ef8b775..d7106553f3 100644
--- a/site/src/components/Repl/SplitPane.svelte
+++ b/site/src/components/Repl/SplitPane.svelte
@@ -71,6 +71,7 @@
 	}
 
 	.pane {
+		position: relative;
 		float: left;
 		width: 100%;
 		height: 100%;
diff --git a/site/src/components/Repl/index.svelte b/site/src/components/Repl/index.svelte
index 8e8b48bcba..c58e3d22bc 100644
--- a/site/src/components/Repl/index.svelte
+++ b/site/src/components/Repl/index.svelte
@@ -207,48 +207,6 @@
 		height: 100%;
 	}
 
-	.repl-inner :global(.message) {
-		position: relative;
-		border-radius: var(--border-r);
-		margin: 0;
-		padding: 1.2rem 1.6rem 1.2rem 4.4rem;
-		vertical-align: middle;
-		font: 400 1.2rem/1.7 var(--font);
-		color: white;
-	}
-
-	.repl-inner :global(.message::before) {
-		content: '!';
-		position: absolute;
-		left: 1.2rem;
-		top: 1.1rem;
-		width: 1rem;
-		height: 1rem;
-		text-align: center;
-		line-height: 1;
-		padding: .4rem;
-		border-radius: 50%;
-		color: white;
-		border: .2rem solid white;
-	}
-
-	.repl-inner :global(.error.message) {
-		background-color: #da106e;
-	}
-
-	.repl-inner :global(.warning.message) {
-		background-color: #e47e0a;
-	}
-
-	.repl-inner :global(.info.message) {
-		background-color: var(--second);
-		animation: fade-in .4s .2s both;
-	}
-
-	.repl-inner :global(.error) :global(.filename) {
-		cursor: pointer;
-	}
-
 	.offset {
 		transform: translate(-50%,0);
 	}