Give declarations for consts have annotations

Author: Hosch250

Rubberduck.Parsing/Symbols/ConstantDeclaration.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using Antlr4.Runtime;
+using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
 
@@ -13,6 +15,7 @@ public ConstantDeclaration(
             string asTypeName,
             VBAParser.AsTypeClauseContext asTypeContext,
             string typeHint,
+            IEnumerable<IAnnotation> annotations,
             Accessibility accessibility, 
             DeclarationType declarationType, 
             string value)
@@ -23,6 +26,7 @@ public ConstantDeclaration(
                   asTypeName,
                   asTypeContext,
                   typeHint,
+                  annotations,
                   accessibility, 
                   declarationType, 
                   value, 
@@ -39,6 +43,7 @@ public ConstantDeclaration(
             string asTypeName,
             VBAParser.AsTypeClauseContext asTypeContext,
             string typeHint,
+            IEnumerable<IAnnotation> annotations,
             Accessibility accessibility, 
             DeclarationType declarationType,
             string value,
@@ -59,7 +64,8 @@ public ConstantDeclaration(
                  selection,
                  false,
                  asTypeContext,
-                 isBuiltIn)
+                 isBuiltIn,
+                 annotations)
         {
             _expression = value;
         }

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -14,10 +14,8 @@ namespace Rubberduck.Parsing.Symbols
 {
     public class DeclarationSymbolsListener : VBAParserBaseListener
     {
-        private readonly RubberduckParserState _state;
         private readonly QualifiedModuleName _qualifiedName;
         private readonly Declaration _moduleDeclaration;
-        private readonly Declaration _projectDeclaration;
 
         private string _currentScope;
         private Declaration _currentScopeDeclaration;
@@ -37,7 +35,6 @@ public DeclarationSymbolsListener(
             IDictionary<Tuple<string, DeclarationType>, Attributes> attributes,
             Declaration projectDeclaration)
         {
-            _state = state;
             _qualifiedName = qualifiedName;
             _annotations = annotations;
             _attributes = attributes;
@@ -46,8 +43,6 @@ public DeclarationSymbolsListener(
                 ? DeclarationType.ProceduralModule
                 : DeclarationType.ClassModule;
 
-            _projectDeclaration = projectDeclaration;
-
             var key = Tuple.Create(_qualifiedName.ComponentName, declarationType);
             var moduleAttributes = attributes.ContainsKey(key)
                 ? attributes[key]
@@ -57,7 +52,7 @@ public DeclarationSymbolsListener(
             {
                 _moduleDeclaration = new ProceduralModuleDeclaration(
                     _qualifiedName.QualifyMemberName(_qualifiedName.Component.Name),
-                    _projectDeclaration,
+                    projectDeclaration,
                     _qualifiedName.Component.Name,
                     false,
                     FindAnnotations(),
@@ -70,7 +65,7 @@ public DeclarationSymbolsListener(
                 Declaration superType = null;
                 if (type == vbext_ComponentType.vbext_ct_Document)
                 {
-                    foreach (var coclass in _state.CoClasses)
+                    foreach (var coclass in state.CoClasses)
                     {
                         try
                         {
@@ -103,7 +98,7 @@ public DeclarationSymbolsListener(
 
                 _moduleDeclaration = new ClassModuleDeclaration(
                     _qualifiedName.QualifyMemberName(_qualifiedName.Component.Name),
-                    _projectDeclaration,
+                    projectDeclaration,
                     _qualifiedName.Component.Name,
                     false,
                     FindAnnotations(),
@@ -765,13 +760,16 @@ public override void EnterConstSubStmt(VBAParser.ConstSubStmtContext context)
             var typeHint = Identifier.GetTypeHintValue(identifier);
             var name = Identifier.GetName(identifier);
             var value = context.expression().GetText();
+            var constStmt = (VBAParser.ConstStmtContext) context.Parent;
+
             var declaration = new ConstantDeclaration(
                 new QualifiedMemberName(_qualifiedName, name),
                 _parentDeclaration,
                 _currentScope,
                 asTypeName,
                 asTypeClause,
                 typeHint,
+                FindAnnotations(constStmt.Start.Line),
                 accessibility,
                 DeclarationType.Constant,
                 value,