fixed ImplicitActiveSheetReferenceInspection and broken tests

Author: retailcoder

RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs

@@ -4,20 +4,14 @@
 using Rubberduck.Inspections.Resources;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor.Application;
-using Rubberduck.VBEditor.Extensions;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections
 {
     public sealed class ImplicitActiveSheetReferenceInspection : InspectionBase
     {
-        private readonly IHostApplication _hostApp;
-
-        public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState state)
+        public ImplicitActiveSheetReferenceInspection(RubberduckParserState state)
             : base(state)
         {
-            _hostApp = vbe.HostApplication();
         }
 
         public override string Meta { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionMeta; } }
@@ -31,23 +25,18 @@ public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState st
 
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
-            if (_hostApp == null || _hostApp.ApplicationName != "Excel")
-            {
-                return Enumerable.Empty<InspectionResultBase>();
-                // if host isn't Excel, the ExcelObjectModel declarations shouldn't be loaded anyway.
-            }
-
             var matches = BuiltInDeclarations.Where(item =>
                         item.ProjectName == "Excel" &&
                         Targets.Contains(item.IdentifierName) &&
-                        item.ParentDeclaration.ComponentName == "Global" &&
+                        item.ParentDeclaration.ComponentName == "_Global" &&
                         item.AsTypeName == "Range").ToList();
 
             var issues = matches.Where(item => item.References.Any())
                 .SelectMany(declaration => declaration.References.Distinct());
 
-            return issues.Select(issue => 
-                new ImplicitActiveSheetReferenceInspectionResult(this, issue));
+            return issues
+                .Where(issue => !issue.IsInspectionDisabled(Name))
+                .Select(issue => new ImplicitActiveSheetReferenceInspectionResult(this, issue));
         }
     }
 }

RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs

@@ -49,7 +49,7 @@ End Sub
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
             Assert.AreEqual(1, inspectionResults.Count());
@@ -86,10 +86,10 @@ End Sub
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
-            Assert.AreEqual(1, inspectionResults.Count());
+            Assert.AreEqual(0, inspectionResults.Count());
         }
 
         [TestMethod]
@@ -127,7 +127,7 @@ Dim arr1() As Variant
             parser.Parse(new CancellationTokenSource());
             if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, parser.State);
+            var inspection = new ImplicitActiveSheetReferenceInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
             inspectionResults.First().QuickFixes.Single(s => s is IgnoreOnceQuickFix).Fix();
@@ -146,7 +146,7 @@ public void InspectionType()
                 .Build();
             var vbe = builder.AddProject(project).Build();
 
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, null);
+            var inspection = new ImplicitActiveSheetReferenceInspection(null);
             Assert.AreEqual(CodeInspectionType.MaintainabilityAndReadabilityIssues, inspection.InspectionType);
         }
 
@@ -162,7 +162,7 @@ public void InspectionName()
             var vbe = builder.AddProject(project).Build();
 
             const string inspectionName = "ImplicitActiveSheetReferenceInspection";
-            var inspection = new ImplicitActiveSheetReferenceInspection(vbe.Object, null);
+            var inspection = new ImplicitActiveSheetReferenceInspection(null);
 
             Assert.AreEqual(inspectionName, inspection.Name);
         }