Make ObsoleteCallStatementInspection more precise

Also removes the use of a CodeModule.

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Concrete/ObsoleteCallStatementInspection.cs

@@ -40,13 +40,10 @@ namespace Rubberduck.Inspections.Concrete
     /// </example>
     public sealed class ObsoleteCallStatementInspection : ParseTreeInspectionBase
     {
-        private readonly IProjectsProvider _projectsProvider;
-
-        public ObsoleteCallStatementInspection(IDeclarationFinderProvider declarationFinderProvider, IProjectsProvider projectsProvider)
+        public ObsoleteCallStatementInspection(IDeclarationFinderProvider declarationFinderProvider)
             : base(declarationFinderProvider)
         {
             Listener = new ObsoleteCallStatementListener();
-            _projectsProvider = projectsProvider;
         }
 
         public override IInspectionListener Listener { get; }
@@ -57,23 +54,19 @@ protected override string ResultDescription(QualifiedContext<ParserRuleContext>
 
         protected override bool IsResultContext(QualifiedContext<ParserRuleContext> context)
         {
-            //FIXME At least use a parse tree here instead of the COM API.
-            string lines;
-            var component = _projectsProvider.Component(context.ModuleName);
-            using (var module = component.CodeModule)
+            if (!context.Context.TryGetFollowingContext(out VBAParser.IndividualNonEOFEndOfStatementContext followingEndOfStatement)
+                || followingEndOfStatement.COLON() == null)
             {
-                lines = module.GetLines(context.Context.Start.Line,
-                    context.Context.Stop.Line - context.Context.Start.Line + 1);
+                return true;
             }
 
-            var stringStrippedLines = string.Join(string.Empty, lines).StripStringLiterals();
-
-            if (stringStrippedLines.HasComment(out var commentIndex))
+            if (!context.Context.TryGetPrecedingContext(out VBAParser.IndividualNonEOFEndOfStatementContext precedingEndOfStatement)
+                || precedingEndOfStatement.endOfLine() == null)
             {
-                stringStrippedLines = stringStrippedLines.Remove(commentIndex);
+                return true;
             }
 
-            return !stringStrippedLines.Contains(":");
+            return false;
         }
 
         public class ObsoleteCallStatementListener : InspectionListenerBase

RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs

@@ -43,6 +43,28 @@ public void ObsoleteCallStatement_DoesNotReturnResult_InstructionSeparator()
             Assert.AreEqual(0, InspectionResultsForStandardModule(inputCode).Count());
         }
 
+        [Test]
+        [Category("Inspections")]
+        public void ObsoleteCallStatement_ReturnsResult_LabelInFront()
+        {
+            const string inputCode =
+                @"Sub Foo()
+    Foo: Call Foo
+End Sub";
+            Assert.AreEqual(1, InspectionResultsForStandardModule(inputCode).Count());
+        }
+
+        [Test]
+        [Category("Inspections")]
+        public void ObsoleteCallStatement_ReturnsResult_LabelInFrontWithSeparator()
+        {
+            const string inputCode =
+                @"Sub Foo()
+    Foo: Call Foo : Foo
+End Sub";
+            Assert.AreEqual(1, InspectionResultsForStandardModule(inputCode).Count());
+        }
+
         [Test]
         [Category("Inspections")]
         public void ObsoleteCallStatement_ReturnsResult_ColonInComment()
@@ -111,14 +133,14 @@ Call Foo
         [Category("Inspections")]
         public void InspectionName()
         {
-            var inspection = new ObsoleteCallStatementInspection(null, null);
+            var inspection = new ObsoleteCallStatementInspection(null);
 
             Assert.AreEqual(nameof(ObsoleteCallStatementInspection), inspection.Name);
         }
 
         protected override IInspection InspectionUnderTest(RubberduckParserState state)
         {
-            return new ObsoleteCallStatementInspection(state, state.ProjectsProvider);
+            return new ObsoleteCallStatementInspection(state);
         }
     }
 }

RubberduckTests/Inspections/RedundantOptionInspectionTests.cs

@@ -32,7 +32,7 @@ public void RedundantOptionInspection_Ignored_DoesNotReturnResult()
             using (var state = MockParser.CreateAndParse(vbe.Object))
             {
 
-                var inspection = new ObsoleteCallStatementInspection(state, state.ProjectsProvider);
+                var inspection = new ObsoleteCallStatementInspection(state);
                 var inspector = InspectionsHelper.GetInspector(inspection);
                 var inspectionResults = inspector.FindIssuesAsync(state, CancellationToken.None).Result;
 

RubberduckTests/QuickFixes/IgnoreOnceQuickFixTests.cs

@@ -465,7 +465,7 @@ Sub Goo(arg1 As Integer, arg1 As String)
     Call Foo
 End Sub";
 
-            var actualCode = ApplyIgnoreOnceToAllResults(inputCode, state => new ObsoleteCallStatementInspection(state, state.ProjectsProvider), TestStandardModuleVbeSetup);
+            var actualCode = ApplyIgnoreOnceToAllResults(inputCode, state => new ObsoleteCallStatementInspection(state), TestStandardModuleVbeSetup);
             Assert.AreEqual(expectedCode, actualCode);
         }
 

RubberduckTests/QuickFixes/RemoveExplicitCallStatementQuickFixTests.cs

@@ -32,7 +32,7 @@ Sub Goo(arg1 As Integer, arg1 As String)
     Foo
 End Sub";
 
-            var actualCode = ApplyQuickFixToAllInspectionResults(inputCode, state => new ObsoleteCallStatementInspection(state, state.ProjectsProvider));
+            var actualCode = ApplyQuickFixToAllInspectionResults(inputCode, state => new ObsoleteCallStatementInspection(state));
             Assert.AreEqual(expectedCode, actualCode);
         }