Fix error reporting offsets

Author: mbolis

src/disk.ts

@@ -1,4 +1,3 @@
-import CodeMirror from "codemirror";
 import * as output from "./output";
 import EventEmitter from "events";
 

src/frames.ts

@@ -7,6 +7,7 @@ type FrameMutations = {
   height?: number;
   opacity?: number;
   strokes?: Stroke[];
+  color?: string;
   foreground?: string;
   background?: string;
   speed?: number;
@@ -23,6 +24,7 @@ export class Frame {
     readonly height = 0,
     readonly opacity = 1,
     readonly strokes = [] as Stroke[],
+    readonly color = "",
     readonly foreground = "",
     readonly background = "",
     readonly speed = 100,
@@ -34,14 +36,16 @@ export class Frame {
 
   with(properties: FrameMutations): Frame {
     return new Frame(
-      properties.position || this.position,
-      properties.facing !== undefined ? properties.facing : this.facing,
-      properties.height !== undefined ? properties.height : this.height,
-      properties.opacity !== undefined ? properties.opacity : this.opacity,
-      properties.strokes || this.strokes,
-      properties.foreground !== undefined ? properties.foreground : this.foreground,
-      properties.background !== undefined ? properties.background : this.background,
-      properties.speed !== undefined ? properties.speed : this.speed);
+      properties.position ?? this.position,
+      properties.facing ?? this.facing,
+      properties.height ?? this.height,
+      properties.opacity ?? this.opacity,
+      properties.strokes ?? this.strokes,
+      properties.color ?? this.color,
+      properties.foreground ?? this.foreground,
+      properties.background ?? this.background,
+      properties.speed ?? this.speed,
+    );
   }
 }
 
@@ -51,7 +55,8 @@ export class Animation {
 
   constructor(
     readonly duration: number,
-    readonly update: (delta: number, keyFrame: Frame) => Frame) { }
+    readonly update: (delta: number, keyFrame: Frame) => Frame,
+  ) { }
 
   get currentFrame(): Frame {
     return this.update(this.elapsed / this.duration, this.keyFrame);

src/gui.ts

@@ -20,7 +20,7 @@ export class Painter {
     this.facing = frame.facing;
     this.z = ZOOM_DOWN + frame.height * (ZOOM_UP - ZOOM_DOWN);
     this.opacity = frame.opacity;
-    this.brushColor = frame.foreground;
+    this.brushColor = frame.color;
   }
 
   draw(ctx: CanvasRenderingContext2D) {

src/index.ts

@@ -407,14 +407,16 @@ function ensureRunning() {
 
       const errMessage = /(.*) \((\d+):(\d+)\)\s*$/.exec(err.message);
       if (errMessage) {
-        const [, message, line, ch] = errMessage;
-        const startPos = CodeMirror.Pos(+line, +ch);
-        const token = editor.getTokenAt(startPos, true);
-        startPos.line--;
+        const [, message, msgLine, msgCh] = errMessage;
+        const line = +msgLine - 1;
+        const ch = +msgCh;
+        const token = editor.getLineTokens(line, true).find(token => token.start === ch);
+        const startPos = CodeMirror.Pos(line, ch);
         const endPos = { ...startPos, ch: startPos.ch + token.string.length };
-        markErrorPos(startPos, endPos, `${message} '${token.string}' (${line}:${ch})`);
+        markErrorPos(startPos, endPos, `${message} '${token.string}' (${line+1}:${ch})`);
       } else {
-        output.error(err);
+        const message = err.message ?? err;
+        output.error(message);
       }
 
       throw err;

src/interpreter.ts

@@ -152,6 +152,9 @@ export class Interpreter {
       get: fn(() => currentColor),
       set: fn((c: any) => {
         currentColor = String(c);
+        this.animation = new Animation(0, (_, keyFrame: Frame) => {
+          return keyFrame.with({ color: currentColor });
+        });
       }),
     });