New point release

Updated dependencies, which required some fixes

Signed-off-by: Mike Lischke <[email protected]>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "antlr4-c3",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "A code completion core implementation for ANTLR4 based parsers",
     "author": "Mike Lischke",
     "license": "MIT",
@@ -28,22 +28,23 @@
         "esbuild": "esbuild ./index.ts --bundle --outfile=lib/index.mjs --format=esm --sourcemap=external"
     },
     "devDependencies": {
-        "@types/jest": "29.5.4",
-        "@types/node": "20.5.9",
-        "@types/unicode-properties": "1.3.0",
-        "@typescript-eslint/eslint-plugin": "6.6.0",
-        "@typescript-eslint/parser": "6.6.0",
-        "antlr4ng-cli": "1.0.2",
-        "esbuild": "0.19.4",
-        "eslint": "8.48.0",
-        "eslint-plugin-import": "2.28.1",
-        "eslint-plugin-jsdoc": "46.5.1",
+        "@types/jest": "29.5.7",
+        "@types/node": "20.8.10",
+        "@types/unicode-properties": "1.3.1",
+        "@typescript-eslint/eslint-plugin": "6.10.0",
+        "@typescript-eslint/parser": "6.10.0",
+        "antlr4ng-cli": "1.0.4",
+        "esbuild": "0.19.5",
+        "eslint": "8.53.0",
+        "eslint-plugin-import": "2.29.0",
+        "eslint-plugin-jsdoc": "46.8.2",
         "eslint-plugin-prefer-arrow": "1.2.3",
-        "jest": "29.6.4",
+        "jest": "29.7.0",
         "ts-jest": "29.1.1",
+        "ts-node": "10.9.1",
         "typescript": "5.2.2"
     },
     "dependencies": {
-        "antlr4ng": "1.1.6"
+        "antlr4ng": "2.0.1"
     }
 }

readme.md

@@ -221,7 +221,7 @@ The last two options potentially create a lot of output which can significantly
 
 ## Release Notes
 
-### 3.3.1
+### 3.3.1 - 3.3.3
 
 Updated dependencies.
 

src/BaseSymbol.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
-import { ParseTree } from "antlr4ng";
+import { type ParseTree } from "antlr4ng";
 
 import { type IScopedSymbol } from "./ScopedSymbol.js";
 import { type ISymbolTable } from "./SymbolTable.js";

src/CodeCompletionCore.ts

@@ -197,7 +197,7 @@ export class CodeCompletionCore {
 
         const callStack: RuleWithStartTokenList = [];
         const startRule = context ? context.ruleIndex : 0;
-        this.processRule(this.atn.ruleToStartState[startRule], 0, callStack, 0, 0);
+        this.processRule(this.atn.ruleToStartState[startRule]!, 0, callStack, 0, 0);
 
         if (this.showResult) {
             console.log(`States processed: ${this.statesProcessed}`);
@@ -504,7 +504,7 @@ export class CodeCompletionCore {
 
         let followSets = setsPerState.get(startState.stateNumber);
         if (!followSets) {
-            const stop = this.atn.ruleToStopState[startState.ruleIndex];
+            const stop = this.atn.ruleToStopState[startState.ruleIndex]!;
             followSets = this.determineFollowSets(startState, stop);
             setsPerState.set(startState.stateNumber, followSets);
         }

tests/CodeCompletionCore.spec.ts

@@ -23,11 +23,12 @@ import { ExprLexer } from "./generated/ExprLexer";
 import { ExprParser } from "./generated/ExprParser";
 import { CodeCompletionCore } from "../src/CodeCompletionCore";
 
-export class TestErrorListener extends BaseErrorListener<ATNSimulator> {
+export class TestErrorListener extends BaseErrorListener {
     public errorCount = 0;
 
-    public override syntaxError<T extends Token>(_recognizer: Recognizer<ATNSimulator>, _offendingSymbol: T,
-        _line: number, _charPositionInLine: number, _msg: string, _e: RecognitionException | null): void {
+    public override syntaxError<S extends Token, T extends ATNSimulator>(_recognizer: Recognizer<T>,
+        _offendingSymbol: S | null, _line: number, _column: number, _msg: string,
+        _e: RecognitionException | null): void {
         ++this.errorCount;
     }
 }