Parse unexpected line endings

Author: SSlinky

server/src/antlr/vba.g4

@@ -464,7 +464,7 @@ functionType: AS wsc typeExpression wsc? arrayDesignator?;
 arrayDesignator: '(' wsc? ')';
 
 // 5.3.1.5 Parameter Lists
-procedureParameters: '(' wsc? parameterList? wsc? ')';
+procedureParameters: '(' wsc? parameterList? wscu? ')';
 propertyParameters: '(' wsc? (parameterList wsc? ',' wsc?)? valueParam wsc? ')';
 validParameterList
     : (positionalParameters wsc? ',' wsc? optionalParameters)
@@ -1198,6 +1198,14 @@ wsc: (WS | LINE_CONTINUATION)+;
 endOfLine
     : wsc? (NEWLINE | commentBody | remStatement) wsc?
     ;
+unexpectedEndOfLine
+    : wsc? (NEWLINE | commentBody | remStatement) wsc?
+    ;
+// White space, continuation, unexpected ending.
+// TODO: Replace as many wsc with wscu and test.
+wscu
+    : (wsc | unexpectedEndOfLine)+
+    ;
 // We usually don't care if a line of code begins with whitespace, and the parser rules are
 // cleaner if we lump that in with the EOL or EOS "token". However, for those cases where
 // something MUST occur on the start of a line, use endOfLineNoWs.

server/src/capabilities/diagnostics.ts

@@ -75,6 +75,16 @@ export class ShadowDeclarationDiagnostic extends BaseDiagnostic {
 }
 
 
+// test
+export class UnexpectedLineEndingDiagnostic extends BaseDiagnostic {
+	message = "Unexpected line ending.";
+	severity = DiagnosticSeverity.Error;
+	constructor(range: Range) {
+		super(range);
+	}
+}
+
+
 export class IgnoredAttributeDiagnostic extends BaseDiagnostic {
 	severity = DiagnosticSeverity.Warning;
 	constructor(range: Range, attributeName: string) {

server/src/project/elements/utils.ts

@@ -0,0 +1,23 @@
+// Core
+import { TextDocument } from 'vscode-languageserver-textdocument';
+
+// Antlr
+import { UnexpectedEndOfLineContext } from '../../antlr/out/vbaParser';
+
+// Project
+import { DiagnosticCapability } from '../../capabilities/capabilities';
+import { BaseContextSyntaxElement, HasDiagnosticCapability } from './base';
+import { UnexpectedLineEndingDiagnostic } from '../../capabilities/diagnostics';
+
+
+export class UnexpectedEndOfLineElement extends BaseContextSyntaxElement<UnexpectedEndOfLineContext> implements HasDiagnosticCapability {
+	diagnosticCapability: DiagnosticCapability;
+
+	constructor(context: UnexpectedEndOfLineContext, document: TextDocument) {
+		super(context, document);
+		this.diagnosticCapability = new DiagnosticCapability(this, () => {
+			this.diagnosticCapability.diagnostics.push(new UnexpectedLineEndingDiagnostic(this.context.range));
+			return this.diagnosticCapability.diagnostics;
+		});
+	}
+}

server/src/project/parser/vbaListener.ts

@@ -24,6 +24,7 @@ import {
 	SubroutineDeclarationContext,
 	TypeSuffixContext,
 	UdtDeclarationContext,
+	UnexpectedEndOfLineContext,
 	WhileStatementContext
 } from '../../antlr/out/vbaParser';
 
@@ -34,6 +35,7 @@ import { ClassElement, ModuleElement, ModuleIgnoredAttributeElement } from '../e
 import { DocumentSettings, VbaClassDocument, VbaModuleDocument } from '../document';
 import { FunctionDeclarationElement, PropertyGetDeclarationElement, PropertyLetDeclarationElement, PropertySetDeclarationElement, SubDeclarationElement } from '../elements/procedure';
 import { DeclarationStatementElement, EnumDeclarationElement, TypeDeclarationElement, TypeSuffixElement } from '../elements/typing';
+import { UnexpectedEndOfLineElement } from '../elements/utils';
 
 
 class CommonParserCapability {
@@ -171,6 +173,11 @@ export class VbaListener extends vbaListener {
         element.declarations.forEach(x => this.document.registerElement(x));
     }
 
+    enterUnexpectedEndOfLine = (ctx: UnexpectedEndOfLineContext) => {
+        const element = new UnexpectedEndOfLineElement(ctx, this.document.textDocument);
+        this.document.registerElement(element);
+    }
+
     enterWhileStatement = (ctx: WhileStatementContext) => {
         const element = new WhileLoopElement(ctx, this.document.textDocument)
         this.document.registerDiagnosticElement(element);