IAnnotatedContext.Annotate sets the annotated context, now need to fix AttributeListener.ExitAnnotation.

Author: retailcoder

Rubberduck.Inspections/Concrete/MissingAttributeInspection.cs

@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Antlr4.Runtime;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;
-using Rubberduck.Parsing;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Inspections;

Rubberduck.Inspections/QuickFixes/SynchronizeAttributesQuickFix.cs

@@ -82,7 +82,7 @@ private void FixMember(IInspectionResult result, ParserRuleContext context)
             var annotationContext = context as VBAParser.AnnotationContext;
             if (annotationContext != null)
             {
-                Fix(memberName, annotationContext);
+                InsertAttributeStatement(memberName, annotationContext);
                 return;
             }
         }
@@ -210,7 +210,7 @@ private static void FixExposedAttribute(RubberduckParserState state, QualifiedMo
         /// </summary>
         /// <param name="memberName"></param>
         /// <param name="context"></param>
-        private void Fix(QualifiedMemberName memberName, VBAParser.AnnotationContext context)
+        private void InsertAttributeStatement(QualifiedMemberName memberName, VBAParser.AnnotationContext context)
         {
             Debug.Assert(context.AnnotationType.HasFlag(AnnotationType.MemberAnnotation));
 

Rubberduck.Parsing/Annotations/AnnotationListener.cs

@@ -23,7 +23,7 @@ public AnnotationListener(IAnnotationFactory factory, QualifiedModuleName qualif
         public override void ExitAnnotation([NotNull] VBAParser.AnnotationContext context)
         {
             var newAnnotation = _factory.Create(context, new QualifiedSelection(_qualifiedName, context.GetSelection()));
-            // It might be an annotation we don't support or a typo.
+            // it might be an annotation we don't support, or a typo.
             if (newAnnotation != null)
             {
                 _annotations.Add(newAnnotation);

Rubberduck.Parsing/Grammar/PartialExtensions/VBAParserPartialExtensions.cs

@@ -67,6 +67,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -105,6 +106,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -143,6 +145,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -195,6 +198,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -231,6 +235,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -267,6 +272,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -303,6 +309,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -339,6 +346,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -375,6 +383,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -411,6 +420,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -447,6 +457,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 
@@ -483,6 +494,7 @@ public Interval IdentifierTokens
 
             public void Annotate(AnnotationContext annotation)
             {
+                annotation.AnnotatedContext = this;
                 _annotations.Add(annotation);
             }
 

Rubberduck.Parsing/VBA/AttributeListener.cs

@@ -27,8 +27,8 @@ public AttributeListener(Tuple<string, DeclarationType> scope)
 
         public override void ExitAnnotation(VBAParser.AnnotationContext context)
         {
+            // note: SynchronizeAttributesQuickFix needs the AnnotatedContext to be from the AttributesPass parse tree.
             _currentAnnotatedContext?.Annotate(context);
-            context.AnnotatedContext = _currentAnnotatedContext as ParserRuleContext;
         }
 
         public override void ExitModuleAttributes(VBAParser.ModuleAttributesContext context)