Support for while/wend blocks

Author: SSlinky

server/src/capabilities/diagnostics.ts

@@ -27,4 +27,12 @@ export class MultipleOperatorsDiagnostic extends BaseDiagnostic {
 	constructor(range: Range) {
 		super(range);
 	}
+}
+
+export class WhileWendDeprecatedDiagnostic extends BaseDiagnostic {
+	message = "The Do...Loop statement provides a more structured and flexible way to perform looping.";
+	severity = DiagnosticSeverity.Information;
+	constructor(range: Range) {
+		super(range);
+	}
 }

server/src/project/elements/flow.ts

@@ -0,0 +1,34 @@
+import { ParserRuleContext } from 'antlr4ts';
+import { BaseContextSyntaxElement, HasDiagnosticCapability } from './base';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { ValueStmtContext, WhileWendStmtContext } from '../../antlr/out/vbaParser';
+import { Diagnostic } from 'vscode-languageserver';
+import { WhileWendDeprecatedDiagnostic } from '../../capabilities/diagnostics';
+
+
+class BaseLoopElement extends BaseContextSyntaxElement {
+	constructor(context: ParserRuleContext, document: TextDocument) {
+		super(context, document);
+	}
+}
+
+
+export class WhileWendLoopElement extends BaseLoopElement implements HasDiagnosticCapability {
+	diagnostics: Diagnostic[] = [];
+	valueStatement: ValueStatementElement;
+
+	constructor(context: WhileWendStmtContext, document: TextDocument) {
+		super(context, document);
+		this.valueStatement = new ValueStatementElement(context.valueStmt(), document);
+	}
+
+	evaluateDiagnostics(): void {
+		this.diagnostics.push(new WhileWendDeprecatedDiagnostic(this.valueStatement.range));
+	}
+}
+
+class ValueStatementElement extends BaseContextSyntaxElement {
+	constructor(context: ValueStmtContext, document: TextDocument) {
+		super(context, document);
+	}
+}

server/src/project/parser/vbaSyntaxParser.ts

@@ -6,7 +6,7 @@ import { ErrorNode } from 'antlr4ts/tree/ErrorNode';
 import { ParseTreeWalker } from 'antlr4ts/tree/ParseTreeWalker';
 
 import { vbaLexer as VbaLexer } from '../../antlr/out/vbaLexer';
-import { AttributeStmtContext, ConstStmtContext, EnumerationStmtContext, EnumerationStmt_ConstantContext, FoldingBlockStmtContext, MethodStmtContext, ModuleContext, ModuleHeaderContext, OperatorsStmtContext, TypeStmtContext, VariableStmtContext, vbaParser as VbaParser } from '../../antlr/out/vbaParser';
+import { AttributeStmtContext, ConstStmtContext, EnumerationStmtContext, EnumerationStmt_ConstantContext, FoldingBlockStmtContext, MethodStmtContext, ModuleContext, ModuleHeaderContext, OperatorsStmtContext, TypeStmtContext, VariableStmtContext, vbaParser as VbaParser, WhileWendStmtContext } from '../../antlr/out/vbaParser';
 import { vbaListener } from '../../antlr/out/vbaListener';
 
 import { VbaClassDocument, VbaModuleDocument } from '../document';
@@ -16,6 +16,7 @@ import { ModuleElement } from '../elements/module';
 import { sleep } from '../../utils/helpers';
 import { CancellationToken } from 'vscode-languageserver';
 import { OperatorElement } from '../elements/operator';
+import { WhileWendLoopElement } from '../elements/flow';
 
 export class SyntaxParser {
     private static _lockIdentifier = 0;
@@ -170,6 +171,11 @@ class VbaTreeWalkListener implements vbaListener {
         const element = new VariableDeclarationsElement(ctx, this.document.textDocument);
         element.declarations.forEach((e) => this.document.registerSymbolInformation(e));
     };
+
+    enterWhileWendStmt = (ctx: WhileWendStmtContext) => {
+        const element = new  WhileWendLoopElement(ctx, this.document.textDocument);
+        this.document.registerDiagnosticElement(element);
+    };
 }
 
 class VbaErrorHandler extends DefaultErrorStrategy {