Support for ignored attributes

Author: SSlinky

server/src/antlr/vba.g4

@@ -78,7 +78,7 @@ classModule
 proceduralModuleHeader
     : endOfLine* nameAttr?
     ;
-classModuleHeader: (endOfLine+ (classAttr | nameAttr))* WS?;
+classModuleHeader: (endOfLine+ (classAttr | nameAttr | ignoredAttr))* WS?;
 
 // VBA Library Projects are allowed to have GoobalNamespace and creatable as true.
 classAttr
@@ -90,6 +90,10 @@ classAttr
     | ATTRIBUTE WS? VB_CUSTOMIZABLE WS? EQ WS? booleanLiteralIdentifier
     ;
 
+ignoredAttr
+    : ATTRIBUTE WS? ambiguousIdentifier WS? EQ WS? expression
+    ;
+
 nameAttr
     : ATTRIBUTE WS? VB_NAME WS? EQ WS? STRINGLITERAL
 	;
@@ -2563,7 +2567,7 @@ STRINGLITERAL
     ;
 
 INTEGERLITERAL
-    : [-]? (DIGIT DIGIT*
+    : MINUS? (DIGIT DIGIT*
     | '&H' [0-9A-F]+
     | '&' [O]? [0-7]+) [%&^]?
     ;

server/src/capabilities/diagnostics.ts

@@ -57,6 +57,14 @@ export class DuplicateAttributeDiagnostic extends BaseDiagnostic {
 	}
 }
 
+export class IgnoredAttributeDiagnostic extends BaseDiagnostic {
+	message = "This attribute will be ignored.";
+	severity = DiagnosticSeverity.Information;
+	constructor(range: Range) {
+		super(range);
+	}
+}
+
 export class MissingOptionExplicitDiagnostic extends BaseDiagnostic {
 	message = "Option Explicit is missing from module header.";
 	severity = DiagnosticSeverity.Warning;

server/src/project/elements/memory.ts

@@ -40,7 +40,7 @@ export abstract class DeclarationElement extends FoldableElement implements Scop
 		}
 
 		const propertyDeclaration = new PropertyDeclarationElement(context, document.textDocument);
-		const predeclaredElement = document.currentScopeElement.declaredNames.get(propertyDeclaration.identifier.text);
+		const predeclaredElement = document.currentScopeElement?.declaredNames.get(propertyDeclaration.identifier.text);
 		if (predeclaredElement && isPropertyDeclarationElement(predeclaredElement)) {
 			predeclaredElement.addPropertyDeclaration(context, document.textDocument);
 			return predeclaredElement;

server/src/project/elements/module.ts

@@ -1,9 +1,9 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { Diagnostic, Range, SymbolInformation, SymbolKind } from 'vscode-languageserver';
-import { ClassModuleContext, ProceduralModuleContext } from '../../antlr/out/vbaParser';
+import { ClassModuleContext, IgnoredAttrContext, ProceduralModuleContext } from '../../antlr/out/vbaParser';
 import { BaseContextSyntaxElement, BaseSyntaxElement, HasDiagnosticCapability, HasSymbolInformation, ScopeElement } from './base';
 import { SymbolInformationFactory } from '../../capabilities/symbolInformation';
-import { MissingAttributeDiagnostic, MissingOptionExplicitDiagnostic } from '../../capabilities/diagnostics';
+import { IgnoredAttributeDiagnostic, MissingAttributeDiagnostic, MissingOptionExplicitDiagnostic } from '../../capabilities/diagnostics';
 import '../../extensions/stringExtensions';
 
 
@@ -138,6 +138,21 @@ export class ClassElement extends BaseModuleElement {
 	}
 }
 
+export class IgnoredAttributeElement extends BaseContextSyntaxElement implements HasDiagnosticCapability {
+	diagnostics: Diagnostic[] = [];
+
+	constructor(context: IgnoredAttrContext, document: TextDocument) {
+		super(context, document);
+	}
+
+	evaluateDiagnostics(): void {
+		this.diagnostics.push(
+			new IgnoredAttributeDiagnostic(this.range)
+		)
+	}
+
+}
+
 
 // export class ModuleElement2 extends BaseContextSyntaxElement implements HasSymbolInformation, HasAttribute, HasDiagnosticCapability {
 // 	private _hasName = false;

server/src/project/parser/vbaSyntaxParser.ts

@@ -1,15 +1,15 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { vbaLexer } from '../../antlr/out/vbaLexer';
-import {  ClassModuleContext, ModuleContext, ProceduralModuleBodyContext, ProceduralModuleContext, ProcedureDeclarationContext, vbaParser } from '../../antlr/out/vbaParser';
+import {  ClassModuleContext, IgnoredAttrContext, ModuleContext, ProceduralModuleBodyContext, ProceduralModuleContext, ProcedureDeclarationContext, vbaParser } from '../../antlr/out/vbaParser';
 import { vbaListener } from '../../antlr/out/vbaListener';
 
 import { VbaClassDocument, VbaModuleDocument } from '../document';
 import { FoldableElement } from '../elements/special';
 import { sleep } from '../../utils/helpers';
 import { CancellationToken } from 'vscode-languageserver';
 import { CharStream, CommonTokenStream, ConsoleErrorListener, DefaultErrorStrategy, ParseTreeWalker, Parser, RecognitionException, Recognizer } from 'antlr4ng';
-import { ClassElement, ModuleElement } from '../elements/module';
+import { ClassElement, IgnoredAttributeElement, ModuleElement } from '../elements/module';
 import { DeclarationElement } from '../elements/memory';
 
 export class SyntaxParser {
@@ -93,15 +93,20 @@ class VbaListener extends vbaListener {
         this.document = document;
     }
 
-    enterProceduralModule = (ctx: ProceduralModuleContext) => {
-        const element = new ModuleElement(ctx, this.document.textDocument);
+    enterClassModule = (ctx: ClassModuleContext) => {
+        const element = new ClassElement(ctx, this.document.textDocument);
         this.document.registerSymbolInformation(element)
             .registerDiagnosticElement(element)
             .registerScopedElement(element);
     };
 
-    enterClassModule = (ctx: ClassModuleContext) => {
-        const element = new ClassElement(ctx, this.document.textDocument);
+    enterIgnoredAttr = (ctx: IgnoredAttrContext) => {
+        const element = new IgnoredAttributeElement(ctx, this.document.textDocument);
+        this.document.registerDiagnosticElement(element);
+    };
+
+    enterProceduralModule = (ctx: ProceduralModuleContext) => {
+        const element = new ModuleElement(ctx, this.document.textDocument);
         this.document.registerSymbolInformation(element)
             .registerDiagnosticElement(element)
             .registerScopedElement(element);