Merge pull request #1912 from Hosch250/Issue1877

Do not fire Obsolete Call inspection when call has instruction separators

Author: Hosch250

RetailCoder.VBE/Inspections/ObsoleteCallStatementInspection.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.VBA;
@@ -25,9 +24,30 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 return new InspectionResultBase[] { };
             }
 
-            return ParseTreeResults.ObsoleteCallContexts.Select(context =>
-                new ObsoleteCallStatementUsageInspectionResult(this,
-                    new QualifiedContext<VBAParser.CallStmtContext>(context.ModuleName, context.Context as VBAParser.CallStmtContext)));
+            var results = new List<ObsoleteCallStatementUsageInspectionResult>();
+
+            foreach (var context in ParseTreeResults.ObsoleteCallContexts)
+            {
+                var lines = context.ModuleName.Component.CodeModule.Lines[
+                        context.Context.Start.Line, context.Context.Stop.Line - context.Context.Start.Line + 1];
+
+                var stringStrippedLines = string.Join(string.Empty, lines).StripStringLiterals();
+
+                int commentIndex;
+                if (stringStrippedLines.HasComment(out commentIndex))
+                {
+                    stringStrippedLines = stringStrippedLines.Remove(commentIndex);
+                }
+
+                if (!stringStrippedLines.Contains(":"))
+                {
+                    results.Add(new ObsoleteCallStatementUsageInspectionResult(this,
+                            new QualifiedContext<VBAParser.CallStmtContext>(context.ModuleName,
+                                context.Context as VBAParser.CallStmtContext)));
+                }
+            }
+
+            return results;
         }
 
         public class ObsoleteCallStatementListener : VBAParserBaseListener

RubberduckTests/Inspections/ObsoleteCallStatementInspectionTests.cs

@@ -80,6 +80,102 @@ public void ObsoleteCallStatement_DoesNotReturnResult()
             Assert.AreEqual(0, inspectionResults.Count());
         }
 
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void ObsoleteCallStatement_DoesNotReturnResult_InstructionSeparator()
+        {
+            const string inputCode =
+@"Sub Foo()
+    Call Foo: Foo
+End Sub";
+
+            //Arrange
+            var settings = new Mock<IGeneralConfigService>();
+            var config = GetTestConfig();
+            settings.Setup(x => x.LoadConfiguration()).Returns(config);
+
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
+
+            parser.Parse();
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var inspection = new ObsoleteCallStatementInspection(parser.State);
+            var inspector = new Inspector(settings.Object, new IInspection[] { inspection });
+
+            var inspectionResults = inspector.FindIssuesAsync(parser.State, CancellationToken.None).Result;
+
+            Assert.AreEqual(0, inspectionResults.Count());
+        }
+
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void ObsoleteCallStatement_ReturnsResult_ColonInComment()
+        {
+            const string inputCode =
+@"Sub Foo()
+    Call Foo ' I''ve got a colon: see?
+End Sub";
+
+            //Arrange
+            var settings = new Mock<IGeneralConfigService>();
+            var config = GetTestConfig();
+            settings.Setup(x => x.LoadConfiguration()).Returns(config);
+
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
+
+            parser.Parse();
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var inspection = new ObsoleteCallStatementInspection(parser.State);
+            var inspector = new Inspector(settings.Object, new IInspection[] { inspection });
+
+            var inspectionResults = inspector.FindIssuesAsync(parser.State, CancellationToken.None).Result;
+
+            Assert.AreEqual(1, inspectionResults.Count());
+        }
+
+        [TestMethod]
+        [TestCategory("Inspections")]
+        public void ObsoleteCallStatement_ReturnsResult_ColonInStringLiteral()
+        {
+            const string inputCode =
+@"Sub Foo(ByVal str As String)
+    Call Foo("":"")
+End Sub";
+
+            //Arrange
+            var settings = new Mock<IGeneralConfigService>();
+            var config = GetTestConfig();
+            settings.Setup(x => x.LoadConfiguration()).Returns(config);
+
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = MockParser.Create(vbe.Object, new RubberduckParserState());
+
+            parser.Parse();
+            if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var inspection = new ObsoleteCallStatementInspection(parser.State);
+            var inspector = new Inspector(settings.Object, new IInspection[] { inspection });
+
+            var inspectionResults = inspector.FindIssuesAsync(parser.State, CancellationToken.None).Result;
+
+            Assert.AreEqual(1, inspectionResults.Count());
+        }
+
         [TestMethod]
         [TestCategory("Inspections")]
         public void ObsoleteCallStatement_ReturnsMultipleResults()