Merged stashed changes

Author: SSlinky

package-lock.json

@@ -90,20 +90,18 @@
 		"postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
 		"test": "sh ./scripts/e2e.sh",
 		"textMate": "npx js-yaml client/src/syntaxes/vba.tmLanguage.yaml > client/out/vba.tmLanguage.json",
-		"antlr4ts": "antlr4ts -visitor ./server/src/antlr/vba.g4 -o ./server/src/antlr/out/"
+		"antlr4ts": "antlr4ng -Dlanguage=TypeScript -visitor ./server/src/antlr/vba.g4 -o ./server/src/antlr/out/"
 	},
 	"devDependencies": {
 		"@types/mocha": "^9.1.0",
 		"@types/node": "^16.11.7",
 		"@typescript-eslint/eslint-plugin": "^5.30.0",
 		"@typescript-eslint/parser": "^5.30.0",
-		"antlr4ts-cli": "^0.5.0-alpha.4",
+		"antlr4ng": "^3.0.4",
+		"antlr4ng-cli": "^2.0.0",
 		"eslint": "^8.13.0",
 		"js-yaml": "^4.1.0",
 		"mocha": "^9.2.1",
 		"typescript": "^4.7.2"
-	},
-	"dependencies": {
-		"antlr4ts": "^0.5.0-alpha.4"
 	}
 }