C#: Fix FPs in RedundantToStringCall.ql

csharp/ql/lib/semmle/code/csharp/commons/Strings.qll

@@ -29,7 +29,7 @@ class ImplicitToStringExpr extends Expr {
       m = p.getCallable()
     |
       m = any(SystemTextStringBuilderClass c).getAMethod() and
-      m.getName().regexpMatch("Append(Line)?") and
+      m.getName() = "Append" and
       not p.getType() instanceof ArrayType
       or
       p instanceof StringFormatItemParameter and

csharp/ql/src/Useless code/RedundantToStringCall.ql

@@ -18,5 +18,6 @@ import semmle.code.csharp.frameworks.System
 from MethodCall mc
 where
   mc instanceof ImplicitToStringExpr and
-  mc.getTarget() instanceof ToStringMethod
+  mc.getTarget() instanceof ToStringMethod and
+  not mc.getQualifier() instanceof BaseAccess
 select mc, "Redundant call to 'ToString' on a String object."

csharp/ql/test/query-tests/Useless Code/RedundantToStringCall/RedundantToStringCall.cs

@@ -1,16 +1,24 @@
 using System;
+using System.Text;
 
 class RedundantToString
 {
     public void M(object o)
     {
-        Console.WriteLine(o.ToString()); // BAD
+        Console.WriteLine(o.ToString()); // $ Alert
         Console.WriteLine(o); // GOOD
 
-        Console.WriteLine($"Hello: {o.ToString()}"); // BAD
+        Console.WriteLine($"Hello: {o.ToString()}"); // $ Alert
         Console.WriteLine($"Hello: {o}"); // GOOD
 
-        Console.WriteLine("Hello: " + o.ToString()); // BAD
+        Console.WriteLine("Hello: " + o.ToString()); // $ Alert
         Console.WriteLine("Hello: " + o); // GOOD
+
+        var sb = new StringBuilder();
+        sb.Append(o.ToString()); // $ Alert
+        sb.Append(o); // GOOD
+        sb.AppendLine(o.ToString()); // GOOD
+
+        Console.WriteLine($"Hello: {base.ToString()}"); // GOOD
     }
 }

csharp/ql/test/query-tests/Useless Code/RedundantToStringCall/RedundantToStringCall.expected

@@ -1,4 +1,5 @@
-| RedundantToStringCall.cs:7:27:7:38 | call to method ToString | Redundant call to 'ToString' on a String object. |
-| RedundantToStringCall.cs:10:37:10:48 | call to method ToString | Redundant call to 'ToString' on a String object. |
-| RedundantToStringCall.cs:13:39:13:50 | call to method ToString | Redundant call to 'ToString' on a String object. |
+| RedundantToStringCall.cs:8:27:8:38 | call to method ToString | Redundant call to 'ToString' on a String object. |
+| RedundantToStringCall.cs:11:37:11:48 | call to method ToString | Redundant call to 'ToString' on a String object. |
+| RedundantToStringCall.cs:14:39:14:50 | call to method ToString | Redundant call to 'ToString' on a String object. |
+| RedundantToStringCall.cs:18:19:18:30 | call to method ToString | Redundant call to 'ToString' on a String object. |
 | RedundantToStringCallBad.cs:7:45:7:56 | call to method ToString | Redundant call to 'ToString' on a String object. |

csharp/ql/test/query-tests/Useless Code/RedundantToStringCall/RedundantToStringCall.qlref

@@ -1 +1,3 @@
-Useless code/RedundantToStringCall.ql
+query: Useless code/RedundantToStringCall.ql
+postprocess:
+  - utils/test/InlineExpectationsTestQuery.ql

csharp/ql/test/query-tests/Useless Code/RedundantToStringCall/RedundantToStringCallBad.cs

@@ -4,6 +4,6 @@ class Bad
 {
     static string Hello(object o)
     {
-        return string.Format("Hello, {0}!", o.ToString());
+        return string.Format("Hello, {0}!", o.ToString()); // $ Alert
     }
 }