Handle more builder cases

Author: JohanLarsson

IDisposableAnalyzers.Test/Helpers/DisposableTests.Ignores.cs

@@ -1095,6 +1095,7 @@ public void Dispose()
             [TestCase(".Append((string?)null)")]
             [TestCase(".Append(condition, string.Empty)")]
             [TestCase(".Append(!condition, string.Empty)")]
+            [TestCase(".Append(true).Append(condition).Append(!condition)")]
             public static void Builder(string expression)
             {
                 var syntaxTree = CSharpSyntaxTree.ParseText("""
@@ -1136,7 +1137,7 @@ public void Dispose() { }
 
                     public void M(bool condition)
                     {
-                        using var s = new S().Append(1, string.Empty).Append(true);
+                        using var s = new S().Append(true);
                     }
                 }
                 """.AssertReplace(".Append(true)", expression));

IDisposableAnalyzers.Test/IDISP016DoNotUseDisposedInstanceTests/Valid.DisposeCall.cs

@@ -1,7 +1,6 @@
 namespace IDisposableAnalyzers.Test.IDISP016DoNotUseDisposedInstanceTests
 {
     using Gu.Roslyn.Asserts;
-    using Microsoft.CodeAnalysis;
     using NUnit.Framework;
 
     public static partial class Valid

IDisposableAnalyzers/Analyzers/ReturnValueAnalyzer.cs

@@ -1,12 +1,10 @@
 namespace IDisposableAnalyzers
 {
-    using System.Collections.Generic;
     using System.Collections.Immutable;
     using System.Linq;
     using System.Threading;
 
     using Gu.Roslyn.AnalyzerExtensions;
-    using Gu.Roslyn.CodeFixExtensions;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;

IDisposableAnalyzers/Helpers/Disposable.Identity.cs

@@ -117,10 +117,15 @@ when target.Declaration is MethodDeclarationSyntax methodDeclaration &&
                             {
                                 case ThisExpressionSyntax:
                                     return true;
-                                case InvocationExpressionSyntax invocation
-                                    when recursion.Target(invocation) is { Symbol.IsStatic: false } next &&
-                                         next.Symbol.ContainingType.IsAssignableTo(target.Symbol.ContainingType, recursion.SemanticModel.Compilation):
-                                    return IsIdentity(next, recursion);
+                                case InvocationExpressionSyntax invocation:
+                                    return recursion.Target(invocation) switch
+                                    {
+                                        { Symbol.IsStatic: false } next
+                                            => next.Symbol.ContainingType.IsAssignableTo(target.Symbol.ContainingType, recursion.SemanticModel.Compilation) &&
+                                               IsIdentity(next, recursion),
+                                        { } => false,
+                                        null => true,
+                                    };
                             }
                         }
                     }

ValidCode/StructBuilder/Client.cs

@@ -22,9 +22,10 @@ public async Task<int> M(bool rth)
             .Append(2,             "version")
             .Append(true,          "subscribe")
             .Append(rth,           "useRTH")
-            //.Append(!rth,           "not")
+            .Append(!rth,           "not")
             .Append("abc",         "text")
             .Append((string?)null, "empty");
+
         await this.socket.SendAsync(request.LengthPrefixed(), SocketFlags.None, CancellationToken.None).ConfigureAwait(false);
         return id;
     }