Revert "inline errors sometimes"

This reverts commit 867fd4e.
pastagang · Jan 16, 2025 · c391305 · c391305
1 parent 867fd4e
commit c391305
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 178 deletions.
diff --git 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
diff --git a/src/error.js b/src/error.js
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
   }
 }