Merge branch 'rubberduck-vba/next' into 4655_KeyNotFoundException

Author: BZngr

Rubberduck.CodeAnalysis/CodePathAnalysis/Walker.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Antlr4.Runtime;
 
 namespace Rubberduck.Inspections.CodePathAnalysis
 {

Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Inspections.CodePathAnalysis.Extensions;
 using System.Linq;
+using Rubberduck.Inspections.CodePathAnalysis.Nodes;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
@@ -30,7 +31,15 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
             var nodes = new List<IdentifierReference>();
             foreach (var variable in variables)
             {
-                var tree = _walker.GenerateTree(variable.ParentScopeDeclaration.Context, variable);
+                var parentScopeDeclaration = variable.ParentScopeDeclaration;
+
+                if (parentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Module))
+                {
+                    continue;
+                }
+
+                var tree = _walker.GenerateTree(parentScopeDeclaration.Context, variable);
+
 
                 nodes.AddRange(tree.GetIdentifierReferences());
             }

Rubberduck.CodeAnalysis/Inspections/Concrete/ModuleWithoutFolderInspection.cs

@@ -13,16 +13,17 @@ public sealed class ModuleWithoutFolderInspection : InspectionBase
     {
         public ModuleWithoutFolderInspection(RubberduckParserState state)
             : base(state)
-        {
-        }
+        {}
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             var modulesWithoutFolderAnnotation = State.DeclarationFinder.UserDeclarations(Parsing.Symbols.DeclarationType.Module)
                 .Where(w => w.Annotations.All(a => a.AnnotationType != AnnotationType.Folder))
                 .ToList();
 
-            return modulesWithoutFolderAnnotation.Select(declaration =>
+            return modulesWithoutFolderAnnotation
+                .Where(declaration => !IsIgnoringInspectionResultFor(declaration, AnnotationName))
+                .Select(declaration =>
                 new DeclarationInspectionResult(this, string.Format(InspectionResults.ModuleWithoutFolderInspection, declaration.IdentifierName), declaration));
         }
     }

RubberduckTests/Inspections/ModuleWithoutFolderInspectionTests.cs

@@ -46,7 +46,7 @@ public void Module_FolderAnnotation()
         [Category("Inspections")]
         public void Module_NonFolderAnnotation()
         {
-            const string inputCode = @"'@IgnoreModule
+            const string inputCode = @"'@PredeclaredId
 Option Explicit";
 
             var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
@@ -58,5 +58,22 @@ public void Module_NonFolderAnnotation()
                 Assert.AreEqual(1, inspectionResults.Count());
             }
         }
+
+        [Test]
+        [Category("Inspections")]
+        public void Module_NoFolderAnnotation_IgnoreWorks()
+        {
+            const string inputCode = @"'@IgnoreModule ModuleWithoutFolder
+Option Explicit";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+                var inspection = new ModuleWithoutFolderInspection(state);
+                var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);
+
+                Assert.IsFalse(inspectionResults.Any());
+            }
+        }
     }
 }