CM fix

breck7 · Nov 21, 2024 · 1449ba4 · 1449ba4
1 parent 64f74cb
commit 1449ba4
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scrollsdk",
-  "version": "95.0.0",
+  "version": "95.0.1",
   "description": "This npm package includes the Particles class, the Parsers compiler-compiler, a Parsers IDE, and more, all implemented in Particles, Parsers, and TypeScript.",
   "types": "./built/scrollsdk.node.d.ts",
   "main": "./products/Particle.js",

diff --git a/parsers/ParsersCodeMirrorMode.ts b/parsers/ParsersCodeMirrorMode.ts
@@ -360,14 +360,19 @@ class ParsersCodeMirrorMode {
   }
 
   private _getAtomStyle(lineIndex: particlesTypes.int, atomIndex: particlesTypes.int): string {
-    const program = this._getParsedProgram()
-
-    // todo: if the current atom is an error, don't show red?
-    if (!program.getAtomPaintAtPosition) console.log(program)
-    const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
-    const style = paint ? <string>textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
-
-    return style || "noPaintDefinedInParsers"
+    try {
+      const program = this._getParsedProgram()
+
+      // todo: if the current atom is an error, don't show red?
+      if (!program.getAtomPaintAtPosition) console.log(program)
+      const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
+      const style = paint ? <string>textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
+
+      return style || "noPaintDefinedInParsers"
+    } catch (err) {
+      console.error(err)
+      return "noPaintDefinedInParsers"
+    }
   }
 
   // todo: remove.

diff --git a/particle/Particle.ts b/particle/Particle.ts
@@ -3094,7 +3094,7 @@ class Particle extends AbstractParticle {
     return str ? indent + str.replace(/\n/g, indent) : ""
   }
 
-  static getVersion = () => "95.0.0"
+  static getVersion = () => "95.0.1"
 
   static fromDisk(path: string): Particle {
     const format = this._getFileFormat(path)

diff --git a/products/ParsersCodeMirrorMode.browser.js b/products/ParsersCodeMirrorMode.browser.js
@@ -317,12 +317,17 @@ class ParsersCodeMirrorMode {
     return style
   }
   _getAtomStyle(lineIndex, atomIndex) {
-    const program = this._getParsedProgram()
-    // todo: if the current atom is an error, don't show red?
-    if (!program.getAtomPaintAtPosition) console.log(program)
-    const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
-    const style = paint ? textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
-    return style || "noPaintDefinedInParsers"
+    try {
+      const program = this._getParsedProgram()
+      // todo: if the current atom is an error, don't show red?
+      if (!program.getAtomPaintAtPosition) console.log(program)
+      const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
+      const style = paint ? textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
+      return style || "noPaintDefinedInParsers"
+    } catch (err) {
+      console.error(err)
+      return "noPaintDefinedInParsers"
+    }
   }
   // todo: remove.
   startState() {

diff --git a/products/ParsersCodeMirrorMode.js b/products/ParsersCodeMirrorMode.js
@@ -318,12 +318,17 @@ class ParsersCodeMirrorMode {
     return style
   }
   _getAtomStyle(lineIndex, atomIndex) {
-    const program = this._getParsedProgram()
-    // todo: if the current atom is an error, don't show red?
-    if (!program.getAtomPaintAtPosition) console.log(program)
-    const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
-    const style = paint ? textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
-    return style || "noPaintDefinedInParsers"
+    try {
+      const program = this._getParsedProgram()
+      // todo: if the current atom is an error, don't show red?
+      if (!program.getAtomPaintAtPosition) console.log(program)
+      const paint = program.getAtomPaintAtPosition(lineIndex, atomIndex)
+      const style = paint ? textMateScopeToCodeMirrorStyle(paint.split(".")) : undefined
+      return style || "noPaintDefinedInParsers"
+    } catch (err) {
+      console.error(err)
+      return "noPaintDefinedInParsers"
+    }
   }
   // todo: remove.
   startState() {

diff --git a/products/Particle.browser.js b/products/Particle.browser.js
@@ -2598,7 +2598,7 @@ Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species
 4.9,2.5,4.5,1.7,virginica
 5.1,3.5,1.4,0.2,setosa
 5,3.4,1.5,0.2,setosa`
-Particle.getVersion = () => "95.0.0"
+Particle.getVersion = () => "95.0.1"
 class AbstractExtendibleParticle extends Particle {
   _getFromExtended(cuePath) {
     const hit = this._getParticleFromExtended(cuePath)

diff --git a/products/Particle.js b/products/Particle.js
@@ -2588,7 +2588,7 @@ Particle.iris = `sepal_length,sepal_width,petal_length,petal_width,species
 4.9,2.5,4.5,1.7,virginica
 5.1,3.5,1.4,0.2,setosa
 5,3.4,1.5,0.2,setosa`
-Particle.getVersion = () => "95.0.0"
+Particle.getVersion = () => "95.0.1"
 class AbstractExtendibleParticle extends Particle {
   _getFromExtended(cuePath) {
     const hit = this._getParticleFromExtended(cuePath)

diff --git a/releaseNotes.scroll b/releaseNotes.scroll
@@ -20,6 +20,9 @@ node_modules/scroll-cli/microlangs/changes.parsers
 
 thinColumns 4
 
+📦 95.0.1 2024-11-21
+🏥 don't crash codemirror if error in parsers
+
 📦 95.0.0 2024-11-19
 🎉 Parsers autocomplete cleanup
 ⚠️ BREAKING: (no one should be affected) removed unused extensions and compilesTo parsers in Parsers