Implemented WhileWend diagnostic

Author: SSlinky

server/src/capabilities/diagnostics.ts

@@ -1,4 +1,4 @@
-import { CodeDescription, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Range, TextDocumentClientCapabilities } from 'vscode-languageserver';
+import { CodeDescription, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Position, Range, TextDocumentClientCapabilities } from 'vscode-languageserver';
 
 
 function hasDiagnosticRelatedInformationCapability(x: TextDocumentClientCapabilities) {
@@ -33,7 +33,10 @@ 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);
+		super(Range.create(
+			range.start,
+			Position.create(range.start.line, range.start.character + 4)
+		));
 	}
 }
 

server/src/project/elements/flow.ts

@@ -1,33 +1,20 @@
-import { ParserRuleContext } from 'antlr4ng';
-import { BaseContextSyntaxElement, HasDiagnosticCapability } from './base';
-import { TextDocument } from 'vscode-languageserver-textdocument';
 import { Diagnostic } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { WhileStatementContext } from '../../antlr/out/vbaParser';
+
+import { BaseContextSyntaxElement, HasDiagnosticCapability } from './base';
 import { WhileWendDeprecatedDiagnostic } from '../../capabilities/diagnostics';
 
 
-class BaseLoopElement extends BaseContextSyntaxElement {
-	constructor(context: ParserRuleContext, document: TextDocument) {
+export class WhileLoopElement extends BaseContextSyntaxElement implements HasDiagnosticCapability {
+	diagnostics: Diagnostic[] = [];
+
+	constructor(context: WhileStatementContext, 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);
-// 	}
-// }
+	evaluateDiagnostics(): void {
+		this.diagnostics.push(new WhileWendDeprecatedDiagnostic(this.range))
+	}
+}

server/src/project/parser/vbaSyntaxParser.ts

@@ -1,7 +1,7 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { vbaLexer } from '../../antlr/out/vbaLexer';
-import {  ClassModuleContext, EnumDeclarationContext, IgnoredAttrContext, ProceduralModuleContext, ProcedureDeclarationContext, vbaParser } from '../../antlr/out/vbaParser';
+import {  ClassModuleContext, EnumDeclarationContext, IgnoredAttrContext, ProceduralModuleContext, ProcedureDeclarationContext, WhileStatementContext, vbaParser } from '../../antlr/out/vbaParser';
 import { vbaListener } from '../../antlr/out/vbaListener';
 
 import { VbaClassDocument, VbaModuleDocument } from '../document';
@@ -10,6 +10,7 @@ import { CancellationToken } from 'vscode-languageserver';
 import { CharStream, CommonTokenStream, DefaultErrorStrategy, ParseTreeWalker, Parser, RecognitionException } from 'antlr4ng';
 import { ClassElement, IgnoredAttributeElement, ModuleElement } from '../elements/module';
 import { DeclarationElement, EnumDeclarationElement } from '../elements/memory';
+import { WhileLoopElement } from '../elements/flow';
 
 export class SyntaxParser {
     private static _lockIdentifier = 0;
@@ -133,6 +134,11 @@ class VbaListener extends vbaListener {
             .registerScopedElement(element);
     };
 
+    enterWhileStatement = (ctx: WhileStatementContext) => {
+        const element = new WhileLoopElement(ctx, this.document.textDocument);
+        this.document.registerDiagnosticElement(element);
+    };
+
 	// visitErrorNode(node: ErrorNode) {
     //     console.log(node.payload);
     // }