Merge pull request #5948 from MDoerner/FixDecOnConstAgain

Fix missing part for VarDesc on constants

Author: retailcoder

Rubberduck.Parsing/VBA/Parsing/AttributeListener.cs

@@ -34,8 +34,8 @@ public override void EnterStartRule(VBAParser.StartRuleContext context)
 
         public override void EnterModuleVariableStmt(VBAParser.ModuleVariableStmtContext context)
         {
-            var variableDeclarationStatemenList = context.variableStmt().variableListStmt().variableSubStmt();
-            foreach (var variableContext in variableDeclarationStatemenList)
+            var variableDeclarationStatementList = context.variableStmt().variableListStmt().variableSubStmt();
+            foreach (var variableContext in variableDeclarationStatementList)
             {
                 var variableName = Identifier.GetName(variableContext);
                 _membersAllowingAttributes[(variableName, DeclarationType.Variable)] = context;
@@ -169,19 +169,29 @@ public override void ExitAttributeStmt(VBAParser.AttributeStmtContext context)
 
             var scopeName = attributeNameParts[0]; 
 
-            //Might be an attribute for the enclosing procedure, function or poperty.
+            //Might be an attribute for the enclosing procedure, function or property.
             if (_currentScopeAttributes != null && scopeName.Equals(_currentScope.scopeIdentifier, StringComparison.OrdinalIgnoreCase))
             {
                 AddOrUpdateAttribute(_currentScopeAttributes, attributeName, context);
                 return;
             }
 
+            //Member attributes
+            //Due to the VBA naming rules, a name can only refer to either a variable or constant.
+
             //Member variable attributes
             var moduleVariableScope = (scopeName, DeclarationType.Variable);
             if (_membersAllowingAttributes.TryGetValue(moduleVariableScope, out _))
             {
                 AddOrUpdateAttribute(moduleVariableScope, attributeName, context);
             }
+
+            //Member constant attributes
+            var moduleConstantScope = (scopeName, DeclarationType.Constant);
+            if (_membersAllowingAttributes.TryGetValue(moduleConstantScope, out _))
+            {
+                AddOrUpdateAttribute(moduleConstantScope, attributeName, context);
+            }
         }
 
         private void AddOrUpdateAttribute((string scopeName, DeclarationType Variable) moduleVariableScope,

RubberduckTests/Inspections/MissingAttributeInspectionTests.cs

@@ -327,7 +327,7 @@ public void VariableDescriptionAnnotationWithoutAttributeReturnsResult_Constant(
 
         [Test]
         [Category("Inspections")]
-        public void Variable_DescriptionAnnotationWithAttributeReturnsResult_Constant()
+        public void Variable_DescriptionAnnotationWithAttributeReturnsNoResult_Constant()
         {
             const string inputCode =
                 @"'@VariableDescription ""Desc""
@@ -336,7 +336,7 @@ public void Variable_DescriptionAnnotationWithAttributeReturnsResult_Constant()
 ";
 
             var inspectionResults = InspectionResults(inputCode);
-            Assert.AreEqual(1, inspectionResults.Count());
+            Assert.IsFalse(inspectionResults.Any());
         }
 
         [Test]
@@ -481,4 +481,4 @@ protected override IInspection InspectionUnderTest(RubberduckParserState state)
             return new MissingAttributeInspection(state);
         }
     }
-}
+}