Switched to new antlr-format package

The formatter has been extracted into an own Node package. Signed-off-by: Mike Lischke <mike@lischke-online.de>
mike-lischke · Nov 25, 2023 · 6e09d40 · 6e09d40
1 parent e76f980
commit 6e09d40
Show file tree

Hide file tree

Showing 56 changed files with 557 additions and 59,520 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -592,6 +592,7 @@
         "@unicode/unicode-11.0.0": "1.5.2",
         "@vscode/debugadapter": "1.64.0",
         "@vscode/debugprotocol": "1.64.0",
+        "antlr-format": "2.0.1",
         "antlr4-c3": "3.3.4",
         "antlr4ng": "2.0.2",
         "await-notify": "1.0.1",

diff --git a/src/backend/Formatter.ts b/src/backend/Formatter.ts
diff --git a/src/backend/SourceContext.ts b/src/backend/SourceContext.ts
@@ -20,6 +20,8 @@ import {
 
 import { CodeCompletionCore, BaseSymbol, LiteralSymbol } from "antlr4-c3";
 
+import { GrammarFormatter } from "antlr-format";
+
 import {
     ANTLRv4Parser, ParserRuleSpecContext, LexerRuleSpecContext, GrammarSpecContext, OptionsSpecContext, ModeSpecContext,
 } from "../parser/ANTLRv4Parser.js";
@@ -49,7 +51,6 @@ import {
 } from "./ContextSymbolTable.js";
 
 import { SentenceGenerator } from "./SentenceGenerator.js";
-import { GrammarFormatter } from "./Formatter.js";
 
 import { GrammarLexerInterpreter } from "./GrammarLexerInterpreter.js";
 import { printableUnicodePoints } from "./Unicode.js";

diff --git a/tests/backend/atn.spec.ts b/tests/backend/atn.spec.ts
@@ -36,9 +36,9 @@ describe("ATN Tests", () => {
                 expect(graph.nodes).toHaveLength(4);
                 expect(graph.nodes[0].name).toEqual("58");
                 expect(graph.nodes[0].type).toEqual(2);
-                expect(graph.nodes[1].name).toEqual("351");
+                expect(graph.nodes[1].name).toEqual("355");
                 expect(graph.nodes[1].type).toEqual(1);
-                expect(graph.nodes[2].name).toEqual("352");
+                expect(graph.nodes[2].name).toEqual("356");
                 expect(graph.nodes[2].type).toEqual(1);
                 expect(graph.nodes[3].name).toEqual("59");
                 expect(graph.nodes[3].type).toEqual(7);