Fixed regression re RuleNode

There was a test still using RuleNode and a wrong check in Trees.js, which lead to test failures.

Signed-off-by: Mike Lischke <mike@lischke-online.de>

runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/Test.ts.stg

@@ -7,7 +7,6 @@ import {
 	ParseTreeWalker,
 	RuleContext,
 	ParserRuleContext,
-	RuleNode,
 	PredictionMode
 } from 'antlr4';
 import <lexerName> from './<lexerName>.js';
@@ -25,7 +24,7 @@ class TreeShapeListener extends ParseTreeListener {
         for (let i = 0; i \< ctx.getChildCount(); i++) {
             const child = ctx.getChild(i) as RuleContext;
             const parent = child.parentCtx;
-            if (parent!.ruleContext !== ctx || !(parent instanceof RuleNode)) {
+            if (parent!.ruleContext !== ctx || !(parent instanceof RuleContext)) {
                 throw `Invalid parse tree shape detected.`;
             }
         }
@@ -64,4 +63,3 @@ function main(argv: string[]): void {
 }
 
 main(process.argv);
-

runtime/JavaScript/src/antlr4/context/RuleContext.d.ts

@@ -6,7 +6,7 @@
 import Parser from "../Parser";
 import ParseTree from "../tree/ParseTree.js";
 import Interval from "../misc/Interval.js";
-import { ParseTreeVisitor } from "../tree/ParseTreeVisitor.js";
+import ParseTreeVisitor from "../tree/ParseTreeVisitor.js";
 
 export declare class RuleContext implements ParseTree {
     public parentCtx: RuleContext | null;
@@ -69,7 +69,6 @@ export declare class RuleContext implements ParseTree {
      */
     public toStringTree(): string;
     public toStringTree(ruleNames: string[] | null, recog: Parser): string;
-
 }
 
 export default RuleContext;

runtime/JavaScript/src/antlr4/tree/ParseTree.d.ts

@@ -9,7 +9,7 @@ import { Interval } from "../misc/Interval.js";
 /** The basic notion of a tree has a parent, a payload, and a list of children.
  *  It is the most abstract interface for all the trees used by ANTLR.
  *
- * Note: this interface is a combination of 4 Java interfaces: ParseTree, SyntaxTree, Tree and RuleNode.
+ * Note: this interface is a combination of 3 Java interfaces: ParseTree, SyntaxTree and Tree.
  */
 export declare interface ParseTree {
     /** The parent of this node. If the return value is null, then this
@@ -56,8 +56,6 @@ export declare interface ParseTree {
      * EOF is unspecified.</p>
      */
     getSourceInterval(): Interval;
-
-    get ruleContext(): RuleContext;
 }
 
 export default ParseTree;

runtime/JavaScript/src/antlr4/tree/TerminalNode.d.ts

@@ -7,7 +7,7 @@ import ParseTree from "./ParseTree.js";
 import Token from "../Token.js";
 import Interval from "../misc/Interval.js";
 
-export declare class TerminalNode implements Omit<ParseTree, "ruleContext"> {
+export declare class TerminalNode implements ParseTree {
     public symbol: Token;
     public parentCtx: ParseTree | null;
 

runtime/JavaScript/src/antlr4/tree/Trees.js

@@ -8,6 +8,7 @@ import ErrorNode from './ErrorNode.js';
 import TerminalNode from './TerminalNode.js';
 import ParseTree from "./ParseTree.js";
 import escapeWhitespace from "../utils/escapeWhitespace.js";
+import RuleContext from "../context/RuleContext.js";
 
 /** A set of utility routines useful for all kinds of ANTLR trees. */
 const Trees = {
@@ -48,7 +49,7 @@ const Trees = {
             ruleNames = recog.ruleNames;
         }
         if (ruleNames !== null) {
-            if (t instanceof ParseTree) {
+            if (t instanceof RuleContext) {
                 const context = t.ruleContext;
                 const altNumber = context.getAltNumber();
                 // use const value of ATN.INVALID_ALT_NUMBER to avoid circular dependency