Merge pull request #7254 from sharwell/ref-readonly

Improve support for RefKind.RefReadOnlyParameter in RS0042 (Do not copy value)
dotnet · Mar 20, 2024 · 8898d8d · 8898d8d
2 parents 0c86a45 + 2276463
commit 8898d8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/AbstractDoNotCopyValue.cs b/src/Roslyn.Diagnostics.Analyzers/Core/AbstractDoNotCopyValue.cs
@@ -1351,9 +1351,8 @@ private static bool CanAssign(RefKind sourceRefKind, RefKind targetRefKind)
                 return (sourceRefKind, targetRefKind) switch
                 {
                     (RefKind.None, _) => true,
-                    (RefKind.Ref, RefKind.Ref) => true,
-                    (RefKind.Ref, RefKind.RefReadOnly or RefKindEx.RefReadOnlyParameter) => true,
-                    (RefKind.RefReadOnly, RefKind.RefReadOnly or RefKindEx.RefReadOnlyParameter) => true,
+                    (RefKind.Ref, RefKind.Ref or RefKind.RefReadOnly or RefKindEx.RefReadOnlyParameter) => true,
+                    (RefKind.RefReadOnly or RefKindEx.RefReadOnlyParameter, RefKind.RefReadOnly or RefKindEx.RefReadOnlyParameter) => true,
                     _ => false,
                 };
             }

diff --git a/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotCopyValueTests.cs b/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotCopyValueTests.cs
@@ -1052,7 +1052,7 @@ internal sealed class NonCopyableAttribute : System.Attribute {{ }}
         [Theory]
         [CombinatorialData]
         public async Task AllowUnsafeAsRefParameterReference2Async(
-            [CombinatorialValues("ref", "in")] string parameterModifiers,
+            [CombinatorialValues("ref", "in", "ref readonly")] string parameterModifiers,
             [CombinatorialValues("in", "scoped in", "ref readonly", "scoped ref readonly")] string asRefParameterModifiers)
         {
             var source = $@"