Enable RCS1169 and RCS1170 if the type is read-only struct

dotnet · Feb 10, 2020 · f34e105 · f34e105
1 parent 988d53f
commit f34e105
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 9 deletions.
diff --git a/src/Analyzers/CSharp/Analysis/MakeMemberReadOnly/MakeMemberReadOnlyAnalyzer.cs b/src/Analyzers/CSharp/Analysis/MakeMemberReadOnly/MakeMemberReadOnlyAnalyzer.cs
@@ -163,7 +163,8 @@ private static bool ValidateType(ITypeSymbol type)
 
             return type.IsReferenceType
                 || type.TypeKind == TypeKind.Enum
-                || CSharpFacts.IsSimpleType(type.SpecialType);
+                || CSharpFacts.IsSimpleType(type.SpecialType)
+                || type.IsReadOnlyStruct();
         }
     }
 }
diff --git a/src/Tests/Analyzers.Tests/RCS1169MakeFieldReadOnlyTests.cs b/src/Tests/Analyzers.Tests/RCS1169MakeFieldReadOnlyTests.cs
@@ -102,6 +102,40 @@ public C()
 ");
         }
 
+        [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.MakeFieldReadOnly)]
+        public async Task Test_InstanceField_ReadOnlyStruct()
+        {
+            await VerifyDiagnosticAndFixAsync(@"
+class C
+{
+    [|private B _f;|]
+
+    public C()
+    {
+        _f = default;
+    }
+}
+
+readonly struct B
+{
+}
+", @"
+class C
+{
+    private readonly B _f;
+
+    public C()
+    {
+        _f = default;
+    }
+}
+
+readonly struct B
+{
+}
+");
+        }
+
         [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.MakeFieldReadOnly)]
         public async Task Test_StaticField()
         {
@@ -148,11 +182,13 @@ void M()
         public async Task TestNoDiagnostic_Struct()
         {
             await VerifyNoDiagnosticAsync(@"
-using System;
-
 class C
 {
-    DateTime _f;
+    B _f;
+}
+
+struct B
+{
 }
 ");
         }

diff --git a/src/Tests/Analyzers.Tests/RCS1170UseReadOnlyAutoPropertyTests.cs b/src/Tests/Analyzers.Tests/RCS1170UseReadOnlyAutoPropertyTests.cs
@@ -55,7 +55,7 @@ class C
 {
     public int P { get; [|private set;|] }
 
-public C()
+    public C()
     {
         P = 0;
     }
@@ -83,7 +83,7 @@ class C
 {
     public StringSplitOptions P { get; [|private set;|] }
 
-public C()
+    public C()
     {
         P = 0;
     }
@@ -103,6 +103,40 @@ public C()
 ");
         }
 
+        [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseReadOnlyAutoProperty)]
+        public async Task Test_InstanceProperty_ReadOnlyStruct()
+        {
+            await VerifyDiagnosticAndFixAsync(@"
+class C
+{
+    public B P { get; [|private set;|] }
+
+    public C()
+    {
+        P = default;
+    }
+}
+
+readonly struct B
+{
+}
+", @"
+class C
+{
+    public B P { get; }
+
+    public C()
+    {
+        P = default;
+    }
+}
+
+readonly struct B
+{
+}
+");
+        }
+
         [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseReadOnlyAutoProperty)]
         public async Task Test_StaticProperty()
         {
@@ -181,11 +215,13 @@ void M()
         public async Task TestNoDiagnostic_Struct()
         {
             await VerifyNoDiagnosticAsync(@"
-using System;
-
 class C
 {
-    public DateTime P { get; private set; }
+    public B P { get; private set; }
+}
+
+struct B
+{
 }
 ");
         }