Made FindMemberAnnotations able to deal with line continued annotations.

Before, the DeclarationSymbolsListener assumed to have at least one annotations starting in each physical line above the member still belonging to the annotations section for the member. That failed terribly when introducing line continuations. Only logical lines should count.

Author: MDoerner

Rubberduck.CodeAnalysis/QuickFixes/RemoveDuplicatedAnnotationQuickFix.cs

@@ -40,7 +40,6 @@ public override void Fix(IInspectionResult result)
                 var annotationList = (VBAParser.AnnotationListContext)annotation.Context.Parent;
 
                 RemoveAnnotationMarker(annotationList, annotation, rewriter);
-                RemoveWhiteSpaceAfterAnnotation(annotationList, annotation, rewriter);
 
                 rewriter.Remove(annotation.Context);
 
@@ -71,18 +70,6 @@ private static void RemoveAnnotationMarker(VBAParser.AnnotationListContext annot
             rewriter.Remove(annotationList.AT(index));
         }
 
-        private static void RemoveWhiteSpaceAfterAnnotation(VBAParser.AnnotationListContext annotationList,
-            IAnnotation annotation, IModuleRewriter rewriter)
-        {
-            var whitespace = annotationList.whiteSpace().FirstOrDefault(ws =>
-                ws.Start.StartIndex == annotation.Context.Stop.StopIndex + 1);
-
-            if (whitespace != null)
-            {
-                rewriter.Remove(whitespace);
-            }
-        }
-
         private static bool OnlyQuoteRemainedFromAnnotationList(KeyValuePair<VBAParser.AnnotationListContext, int> pair)
         {
             return pair.Key.annotation().Length == pair.Value && pair.Key.commentBody() == null;

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -926,8 +926,8 @@ commentOrAnnotation :
 remComment : REM whiteSpace? commentBody;
 comment : SINGLEQUOTE commentBody;
 commentBody : (~NEWLINE)*;
-annotationList : SINGLEQUOTE (AT annotation whiteSpace?)+ (COLON commentBody)?;
-annotation : annotationName annotationArgList?;
+annotationList : SINGLEQUOTE (AT annotation)+ (COLON commentBody)?;
+annotation : annotationName annotationArgList? whiteSpace?;
 annotationName : unrestrictedIdentifier;
 annotationArgList : 
     whiteSpace annotationArg

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -107,7 +107,7 @@ private IEnumerable<IAnnotation> FindAnnotations()
             return annotations.ToList();
         }
 
-        private IEnumerable<IAnnotation> FindAnnotations(int line)
+        private IEnumerable<IAnnotation> FindMemberAnnotations(int firstMemberLine)
         {
             if (_annotations == null)
             {
@@ -117,16 +117,17 @@ private IEnumerable<IAnnotation> FindAnnotations(int line)
             var annotations = new List<IAnnotation>();
 
             // VBE 1-based indexing
-            for (var i = line - 1; i >= 1; i--)
+            for (var currentLine = firstMemberLine - 1; currentLine >= 1; currentLine--)
             {
-                var lineAnnotations = _annotations.Where(a => a.QualifiedSelection.Selection.StartLine == i);
-
-                if (!lineAnnotations.Any())
+                if (!_annotations.Any(annotation => annotation.QualifiedSelection.Selection.StartLine <= currentLine
+                                                        && annotation.QualifiedSelection.Selection.EndLine >= currentLine))
                 {
                     break;
                 }
 
-                annotations.AddRange(lineAnnotations);
+                var annotationsStartingOnCurrentLine = _annotations.Where(a => a.QualifiedSelection.Selection.StartLine == currentLine);
+
+                annotations.AddRange(annotationsStartingOnCurrentLine);
             }
 
             return annotations;
@@ -225,7 +226,7 @@ private Declaration CreateDeclaration(
                 _attributes.TryGetValue(key, out var attributes);
                 _membersAllowingAttributes.TryGetValue(key, out var attributesPassContext);
 
-                var annotations = FindAnnotations(selection.StartLine);
+                var annotations = FindMemberAnnotations(selection.StartLine);
                 switch (declarationType)
                 {
                     case DeclarationType.Procedure:
@@ -821,7 +822,7 @@ public override void EnterConstSubStmt(VBAParser.ConstSubStmtContext context)
                 asTypeName,
                 asTypeClause,
                 typeHint,
-                FindAnnotations(constStmt.Start.Line),
+                FindMemberAnnotations(constStmt.Start.Line),
                 accessibility,
                 DeclarationType.Constant,
                 value,