Fixed problem with prefix setting

The prefix setting can be a string or a function, but was always treated as function. Signed-off-by: Mike Lischke <mike@lischke-online.de>
mike-lischke · Dec 2, 2023 · 5ab5d8d · 5ab5d8d
1 parent d97b1a3
commit 5ab5d8d
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,7 +24,7 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Convert ANTLR4",
+            "name": "Convert ANTLR4 runtime tests",
             "sourceMaps": true,
             "stopOnEntry": false,
             "smartStep": true,
@@ -34,7 +34,7 @@
                 "--loader",
                 "ts-node/esm",
                 "src/convert",
-                "config/antlr4.json",
+                "config/antlr4-runtime-tests.json",
             ],
             "console": "integratedTerminal",
             "trace": false

diff --git a/config/antlr4-runtime-tests.json b/config/antlr4-runtime-tests.json
@@ -0,0 +1,57 @@
+{
+    "packageRoot": "../antlr4/runtime-testsuite/test",
+    "include": [],
+    "exclude": [],
+    "outputPath": "../ANTLRng/runtime-testsuite/test",
+    "options": {
+        "convertAnnotations": false,
+        "sourceMappings": [],
+        "preferArrowFunctions": false,
+        "autoAddBraces": true,
+        "addNullUnionType": false,
+        "suppressTypeWithInitializer": true,
+        "wrapStringLiterals": false,
+        "memberOrderOptions": {
+            "default": [
+                "signature",
+                "public-static-field",
+                "protected-static-field",
+                "private-static-field",
+                "public-decorated-field",
+                "protected-decorated-field",
+                "private-decorated-field",
+                "public-instance-field",
+                "protected-instance-field",
+                "private-instance-field",
+                "public-abstract-field",
+                "protected-abstract-field",
+                "public-field",
+                "protected-field",
+                "private-field",
+                "static-field",
+                "instance-field",
+                "abstract-field",
+                "decorated-field",
+                "field",
+                "public-constructor",
+                "protected-constructor",
+                "private-constructor",
+                "constructor",
+                "public-static-method",
+                "protected-static-method",
+                "private-static-method",
+                "public-decorated-method",
+                "protected-decorated-method",
+                "private-decorated-method",
+                "public-instance-method",
+                "protected-instance-method",
+                "private-instance-method",
+                "public-abstract-method",
+                "protected-abstract-method"
+            ]
+        },
+        "addIndexFiles": false,
+        "useUnqualifiedTypes": true
+    },
+    "debug": {}
+}
diff --git a/cspell.json b/cspell.json
@@ -27,6 +27,7 @@
         "whitespaces"
     ],
     "ignoreWords": [
+        "ANTL",
         "COLONCOLON",
         "FEFFFFFFFFFFFFF",
         "Harwell",
@@ -52,6 +53,7 @@
         "stringtemplate",
         "testlibrary",
         "testng",
+        "testsuite",
         "typeof",
         "unmappable",
         "unmocked",

diff --git a/src/conversion/FileProcessor.ts b/src/conversion/FileProcessor.ts
@@ -321,7 +321,15 @@ export class FileProcessor {
 
         const firstChild = context.getChild(0);
         const header = new java.lang.StringBuilder();
-        const prefix = this.configuration.options?.prefix as ConverterOptionsPrefixFunc ?? (() => { return ""; });
+        let prefix;
+        if (typeof this.configuration.options?.prefix === "string") {
+            prefix = () => { return this.configuration.options?.prefix as string; };
+        } else if (typeof this.configuration.options?.prefix === "function") {
+            prefix = this.configuration.options?.prefix;
+        } else {
+            prefix = () => { return ""; };
+        }
+
         if (firstChild instanceof ParserRuleContext) {
             header.append(this.getLeadingWhiteSpaces(firstChild));
             header.append(prefix(this.source.sourceFile, this.source.targetFile));

diff --git a/src/convert.ts b/src/convert.ts
@@ -22,7 +22,7 @@ if (args.length < 1) {
     process.exit(1);
 }
 
-console.log("\nConverting Java to TypeScript...");
+console.log("\nConverting Java to TypeScript...\n");
 
 // Load the given configuration file and create a converter configuration from it.
 const configFile = args[0];