From c391305a4b56b82f8b2cdb0d14a508e8e76f20bd Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 16 Jan 2025 22:47:54 +0100
Subject: [PATCH] Revert "inline errors sometimes"

This reverts commit 867fd4eb17211e197b7ac67203865e3c77514094.
---
 kabelsalat.html   |   3 +-
 package-lock.json |  23 ----------
 src/error.js      | 113 ----------------------------------------------
 src/hydra.js      |   3 +-
 src/main.js       |  14 ++++--
 src/shader.js     |  13 +-----
 src/strudel.js    |  14 +-----
 src/style.css     |  14 ++----
 8 files changed, 19 insertions(+), 178 deletions(-)
 delete mode 100644 src/error.js
diff --git a/kabelsalat.html b/kabelsalat.html
index b82fe57..755c960 100644
--- a/kabelsalat.html
+++ b/kabelsalat.html
@@ -3,7 +3,6 @@
   <body>
     <script type="module">
       import { SalatRepl } from '@kabelsalat/web';
-      import { ErrorMessage } from './src/error';
       const kabelsalat = new SalatRepl();
       function send(type, msg) {
         window.parent.postMessage({ type, msg });
@@ -95,7 +94,7 @@
               window.parent.strudel.setDocPattern(docId, docPattern);
             }
           } catch (err) {
-            send('onError', new ErrorMessage(0, `${err}`), docId);
+            send('onError', [`kabelsalat error: ${err.message}`, docId]);
           }
         }
       });
diff --git a/package-lock.json b/package-lock.json
index 11309a2..0759980 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,6 @@
         "@codemirror/view": "^6.9.3",
         "@flok-editor/cm-eval": "^1.3.0",
         "@flok-editor/session": "^1.1.0",
-        "@kabelsalat/web": "^0.3.0",
         "@lezer/highlight": "^1.2.1",
         "@replit/codemirror-vim": "^6.2.1",
         "@strudel/codemirror": "^1.1.0",
@@ -552,28 +551,6 @@
         "yjs": "^13.5.50"
       }
     },
-    "node_modules/@kabelsalat/core": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@kabelsalat/core/-/core-0.2.1.tgz",
-      "integrity": "sha512-Uf7deuMGQ+J1l8EL97ElBtRH0mkrkRYiwPI5Y24hpXoGeiOKtoGgcW4Y0/cbaecZqYAPsa4mPXbeEqEpwe901A=="
-    },
-    "node_modules/@kabelsalat/lib": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@kabelsalat/lib/-/lib-0.3.0.tgz",
-      "integrity": "sha512-TmNKCi2vRgcio0bVXBua6YOe6vM/R4V1v1Fk3sirk2wylR6l09EA9Rs19ptBWEqyFnO1Kkvtyi8k2QGFB0zdnw==",
-      "dependencies": {
-        "@kabelsalat/core": "0.2.1"
-      }
-    },
-    "node_modules/@kabelsalat/web": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@kabelsalat/web/-/web-0.3.0.tgz",
-      "integrity": "sha512-wFRcMIseDM/iciONOPIJ8z0YcNe4e0P71b237Gmq8WeImpR3+I/klfeaKwukPS8zk8GbCGbrPXYzr1IlIIZiGg==",
-      "dependencies": {
-        "@kabelsalat/core": "0.2.1",
-        "@kabelsalat/lib": "0.3.0"
-      }
-    },
     "node_modules/@lezer/common": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
diff --git a/src/error.js b/src/error.js
deleted file mode 100644
index 24e622b..0000000
--- a/src/error.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import { StateEffect, StateField, RangeSet } from '@codemirror/state';
-import { EditorView, Decoration, WidgetType } from '@codemirror/view';
-
-const lineFromStackRegex = /:(\d+):\d+$/m;
-
-export class ErrorMessage {
-  /** if lineno is 0, will display at end of file */
-  constructor(lineno, text) {
-    this.lineno = lineno;
-    this.text = text;
-  }
-
-  static fromError(err, lineOffset) {
-    console.log(err.stack);
-    let lineno = 1;
-    try {
-      lineno = lineFromStackRegex.exec(err.stack)[1] - lineOffset;
-      console.log(`parsed lineno ${lineno}`);
-    } catch (e) {
-      console.log('parse failure', e);
-    }
-    return new ErrorMessage(lineno, err.message);
-  }
-
-  eq(other) {
-    const eqPos = other.lineno == this.lineno;
-    const eqText = other.text == this.text;
-    return eqPos && eqText;
-  }
-
-  toString() {
-    return `(line ${this.lineno}) ${this.text}`;
-  }
-}
-
-class ErrorWidget extends WidgetType {
-  constructor(docId, msg) {
-    super();
-    this.docId = docId;
-    this.msg = msg;
-
-    const view = window.editorViews.get(docId);
-    this.from = view.state.doc.length;
-    if (msg.lineno > 0) {
-      // display this after the line
-      const afterLineIndex = view.state.doc.line(msg.lineno).to + 1;
-      const lastIndex = view.state.doc.length;
-      this.from = Math.min(afterLineIndex, lastIndex);
-    }
-  }
-
-  eq(other) {
-    return this.msg.eq(other.msg);
-  }
-
-  toDOM() {
-    const msg = document.createElement('div');
-    msg.classList.add('error');
-    msg.classList.add(this.msg.lineno > 0 ? 'error-inline' : 'error-file');
-    msg.classList.add(`error-${this.docId}`);
-    msg.innerText = this.msg.text;
-    return msg;
-  }
-
-  ignoreEvent() {
-    return false;
-  }
-}
-
-const addError = StateEffect.define();
-const clearErrors = StateEffect.define();
-
-const errorField = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(errors, tr) {
-    errors = errors.map(tr.changes);
-    for (let e of tr.effects) {
-      if (e.is(addError)) {
-        const deco = Decoration.widget({
-          widget: e.value,
-          block: true,
-        }).range(e.value.from);
-
-        errors = errors.update({
-          add: [deco],
-        });
-      } else if (e.is(clearErrors)) {
-        errors = RangeSet.empty;
-      }
-    }
-    return errors;
-  },
-  provide: (f) => EditorView.decorations.from(f),
-});
-
-export function displayEditorError(docId, msg) {
-  const view = window.editorViews.get(docId);
-  const effects = [];
-  effects.push(addError.of(new ErrorWidget(docId, msg)));
-
-  if (!view.state.field(errorField, false)) {
-    effects.push(StateEffect.appendConfig.of(errorField));
-  }
-
-  view.dispatch({ effects });
-}
-
-export function clearEditorErrors(docId) {
-  const view = window.editorViews.get(docId);
-  view.dispatch({ effects: [clearErrors.of()] });
-}
diff --git a/src/hydra.js b/src/hydra.js
index a4bd25d..6d7cc91 100644
--- a/src/hydra.js
+++ b/src/hydra.js
@@ -1,5 +1,4 @@
 import Hydra from 'hydra-synth';
-import { ErrorMessage } from './error';
 
 export class HydraSession {
   constructor({ onError, canvas, onHighlight }) {
@@ -121,7 +120,7 @@ export class HydraSession {
       })()`);
     } catch (error) {
       console.error(error);
-      this.onError(new ErrorMessage(0, error.message), docId);
+      this.onError(`${error}`, docId);
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index d3ae208..c6f1955 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,6 @@ import { nudelConfirm } from './confirm.js';
 import { applySettingsToNudel } from './settings.js';
 import { PastaMirror } from './editor.js';
 import './style.css';
-import { displayEditorError, clearEditorErrors, ErrorMessage } from './error.js';
 
 export const pastamirror = new PastaMirror();
 window.editorViews = pastamirror.editorViews;
@@ -75,11 +74,20 @@ const setError = (message, docId) => {
     // todo: where to show global errors?
     return;
   }
+  const slot = document.querySelector(`#slot-${docId}`);
+  let errorEl = document.querySelector(`#slot-${docId} #error-${docId}`);
 
-  displayEditorError(docId, message);
+  if (errorEl) {
+    errorEl.innerText = message;
+  } else {
+    slot.insertAdjacentHTML('beforeend', `<div class="error" id="error-${docId}">${message}</div>`);
+  }
+};
+const clearError = (docId) => {
+  document.querySelector(`#slot-${docId} #error-${docId}`)?.remove();
 };
 // clear local error when new eval comes in
-session.on('eval', (msg) => clearEditorErrors(msg.docId));
+session.on('eval', (msg) => clearError(msg.docId));
 
 window.addEventListener('message', (event) => {
   if (event.origin !== window.location.origin) {
diff --git a/src/shader.js b/src/shader.js
index 31101d7..97b1920 100644
--- a/src/shader.js
+++ b/src/shader.js
@@ -2,9 +2,6 @@
 Copyright (C) 2025 nudel contributors
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-
-import { ErrorMessage } from './error';
-
 // The standard fullscreen vertex shader.
 const vertexShader = `#version 300 es
 precision highp float;
@@ -271,14 +268,6 @@ function reloadShaderInstanceCode(instance, code) {
   instance.update();
 }
 
-const errorRegex = /ERROR:\s+\d+:(\d+):\s+(.+)/g;
-function parseError(text) {
-  console.log(text);
-  const m = errorRegex.exec(text);
-  const linesInTemplateBeforeUserText = 8;
-  return new ErrorMessage(parseInt(m[1]) - linesInTemplateBeforeUserText, m[2]);
-}
-
 export class ShaderSession {
   constructor({ onError, canvas }) {
     this.onError = onError;
@@ -306,7 +295,7 @@ export class ShaderSession {
       }
       console.log('Shader updated!');
     } catch (err) {
-      this.onError(parseError(err), msg.docId);
+      this.onError(`${err}`, msg.docId);
     }
   }
 }
diff --git a/src/strudel.js b/src/strudel.js
index 1894a7d..d3dc753 100644
--- a/src/strudel.js
+++ b/src/strudel.js
@@ -3,18 +3,6 @@ import { Framer } from '@strudel/draw';
 import { registerSoundfonts } from '@strudel/soundfonts';
 import { transpiler } from '@strudel/transpiler';
 import { getAudioContext, initAudio, registerSynthSounds, samples, webaudioOutput } from '@strudel/webaudio';
-import { ErrorMessage } from './error';
-
-const errorRegex = /^\s*(.+)\s*\((\d+):\d+\)\s*/g;
-
-function parseError(text) {
-  try {
-    const matches = errorRegex.exec(text);
-    return new ErrorMessage(parseInt(matches[2]), matches[1]);
-  } catch {
-    return new ErrorMessage(0, text);
-  }
-}
 
 controls.createParam('docId');
 
@@ -223,7 +211,7 @@ export class StrudelSession {
       //console.log("afterEval", meta);
     } catch (err) {
       console.error(err);
-      this.onError(parseError(err), docId);
+      this.onError(`${err}`, docId);
     }
   }
 }
diff --git a/src/style.css b/src/style.css
index fb92136..6c65de6 100644
--- a/src/style.css
+++ b/src/style.css
@@ -158,18 +158,12 @@ body {
   .error {
     background-color: black;
     font-family: monospace;
+    padding: 8px;
     margin: 0;
-    color: tomato;
-    padding: 0px 2px;
-    border-radius: 3px;
-  }
-
-  .error-inline {
-    border-top: 2px dotted tomato;
-  }
-
-  .error-file {
     border: 2px solid white;
+    color: tomato;
+    position: sticky;
+    bottom: 0;
   }
 }
 
