Handling for EOF during error handling

Author: SSlinky

server/src/project/parser/vbaAntlr.ts

@@ -1,5 +1,5 @@
 // Antlr
-import { CharStream, CommonTokenStream, TokenStream } from 'antlr4ng';
+import { CharStream, CommonTokenStream, Token, TokenStream } from 'antlr4ng';
 import { DefaultErrorStrategy, Parser, RecognitionException } from 'antlr4ng';
 import { vbaLexer } from '../../antlr/out/vbaLexer';
 import { vbaParser } from '../../antlr/out/vbaParser';
@@ -23,7 +23,6 @@ export class VbaLexer extends vbaLexer {
 export class VbaParser extends vbaParser {
 	constructor(input: TokenStream) {
 		super(input);
-		
 	}
 
 	static create(document: string): VbaParser {
@@ -91,10 +90,11 @@ export class VbaFmtParser extends vbafmtParser {
 
 export class VbaErrorHandler extends DefaultErrorStrategy {
     recover(recognizer: Parser, e: RecognitionException): void {
+        // Consume the error token if look-ahead is not EOF.
         const inputStream = recognizer.inputStream;
-        // if (!recognizer.isMatchedEOF) {
+        if (inputStream.LA(1) === Token.EOF) {
             inputStream.consume();
-        // }
+        }
         this.endErrorCondition(recognizer);
     }
 }

server/src/project/parser/vbaListener.ts

@@ -63,6 +63,7 @@ import { DeclarationStatementElement, EnumDeclarationElement, TypeDeclarationEle
 import { FunctionDeclarationElement, PropertyGetDeclarationElement, PropertyLetDeclarationElement, PropertySetDeclarationElement, SubDeclarationElement } from '../elements/procedure';
 import { ExtensionConfiguration } from '../workspace';
 import { Services } from '../../injection/services';
+import { ErrorRuleElement } from '../elements/generic';
 
 export class CommonParserCapability {
     document: VbaClassDocument | VbaModuleDocument;
@@ -213,7 +214,7 @@ export class VbaListener extends vbaListener {
     };
 
     visitErrorNode(node: ErrorNode) {
-        Services.logger.error(`Listener error @ ${node.getPayload()?.line ?? '--'}: ${node.getPayload()?.text}`);
+        this.document.registerElement(new ErrorRuleElement(node, this.document.textDocument));
     }
 }