fix: grammars containing super-splice not working in editor (#370)

ohmjs · Mar 23, 2022 · 6f2f498 · 6f2f498
1 parent 1a518b2
commit 6f2f498
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/ohm-js/src/MatchState.js b/packages/ohm-js/src/MatchState.js
@@ -219,7 +219,7 @@ MatchState.prototype = {
   // Returns the memoized trace entry for `expr` at `pos`, if one exists, `null` otherwise.
   getMemoizedTraceEntry(pos, expr) {
     const posInfo = this.memoTable[pos];
-    if (posInfo && expr.ruleName) {
+    if (posInfo && expr instanceof pexprs.Apply) {
       const memoRec = posInfo.memo[expr.toMemoKey()];
       if (memoRec && memoRec.traceEntry) {
         const entry = memoRec.traceEntry.cloneWithExpr(expr);

diff --git a/packages/ohm-js/test/test-tracing.js b/packages/ohm-js/test/test-tracing.js
@@ -480,3 +480,14 @@ test.failing('bindings', t => {
   const notX = alt.children[1];
   t.deepEqual(notX.children.map(succeeded), [true, true], 'both children succeeded');
 });
+
+// https://github.com/harc/ohm-editor/issues/72
+test('tracing with "..."', t => {
+  const g = ohm.grammar('G { letter := "@" | ... }');
+  const trace = g.trace('x', 'letter');
+  const splice = trace.children[0].children[0];
+  t.is(splice.expr.constructor, ohm.pexprs.Splice);
+  t.is(splice.displayString, '"@" | ...');
+  const alt = splice.children[1];
+  t.is(alt.expr.constructor, ohm.pexprs.Alt);
+});