Merge pull request #3205 from sharwell/with-expression

Update SA1101 to support 'with' expressions

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/ReadabilityRules/SA1101CSharp9UnitTests.cs

@@ -3,9 +3,40 @@
 
 namespace StyleCop.Analyzers.Test.CSharp9.ReadabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.CSharp;
     using StyleCop.Analyzers.Test.CSharp8.ReadabilityRules;
+    using StyleCop.Analyzers.Test.Verifiers;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.ReadabilityRules.SA1101PrefixLocalCallsWithThis,
+        StyleCop.Analyzers.ReadabilityRules.SA1101CodeFixProvider>;
 
     public class SA1101CSharp9UnitTests : SA1101CSharp8UnitTests
     {
+        [Fact]
+        [WorkItem(3201, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3201")]
+        public async Task TestRecordWithExpressionAsync()
+        {
+            var testCode = @"public class Test
+{
+    public record A
+    {
+        public string Prop { get; init; }
+    }
+
+    public A UpdateA(A value)
+    {
+        return value with { Prop = ""newValue"" };
+    }
+}";
+
+            await new CSharpTest(LanguageVersion.CSharp9)
+            {
+                ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssembliesNet50,
+                TestCode = testCode,
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs

@@ -49,5 +49,6 @@ internal static class SyntaxKindEx
         public const SyntaxKind ImplicitStackAllocArrayCreationExpression = (SyntaxKind)9053;
         public const SyntaxKind SuppressNullableWarningExpression = (SyntaxKind)9054;
         public const SyntaxKind NullableDirectiveTrivia = (SyntaxKind)9055;
+        public const SyntaxKind WithInitializerExpression = (SyntaxKind)9062;
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1101PrefixLocalCallsWithThis.cs

@@ -96,13 +96,23 @@ private static void HandleSimpleName(SyntaxNodeAnalysisContext context)
                 return;
 
             case SyntaxKind.SimpleAssignmentExpression:
-                if (((AssignmentExpressionSyntax)context.Node.Parent).Left == context.Node
-                    && (context.Node.Parent.Parent?.IsKind(SyntaxKind.ObjectInitializerExpression) ?? true))
+                if (((AssignmentExpressionSyntax)context.Node.Parent).Left == context.Node)
                 {
-                    /* Handle 'X' in:
-                     *   new TypeName() { X = 3 }
-                     */
-                    return;
+                    if (context.Node.Parent.Parent.IsKind(SyntaxKind.ObjectInitializerExpression))
+                    {
+                        /* Handle 'X' in:
+                         *   new TypeName() { X = 3 }
+                         */
+                        return;
+                    }
+
+                    if (context.Node.Parent.Parent.IsKind(SyntaxKindEx.WithInitializerExpression))
+                    {
+                        /* Handle 'X' in:
+                         *   value with { X = 3 }
+                         */
+                        return;
+                    }
                 }
 
                 break;