Improve refactoring ChangeAccessibility (RR0186)

dotnet · Apr 5, 2020 · 6e7b27b · 6e7b27b
1 parent d35bbfe
commit 6e7b27b
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 9 deletions.
diff --git a/src/Common/CSharp/Analysis/ChangeAccessibilityAnalysis.cs b/src/Common/CSharp/Analysis/ChangeAccessibilityAnalysis.cs
@@ -38,6 +38,7 @@ public static AccessibilityFilter GetValidAccessibilityFilter(
 
             ImmutableArray<Accessibility> avaiableAccessibilities = AvailableAccessibilities;
 
+            bool isAllExplicit = true;
             var all = AccessibilityFilter.None;
 
             AccessibilityFilter valid = AccessibilityFilter.Public
@@ -51,6 +52,8 @@ public static AccessibilityFilter GetValidAccessibilityFilter(
 
                 if (accessibility == Accessibility.NotApplicable)
                 {
+                    isAllExplicit = false;
+
                     accessibility = SyntaxAccessibility.GetDefaultExplicitAccessibility(member);
 
                     if (accessibility == Accessibility.NotApplicable)
@@ -124,16 +127,19 @@ public static AccessibilityFilter GetValidAccessibilityFilter(
                 }
             }
 
-            switch (all)
+            if (isAllExplicit)
             {
-                case AccessibilityFilter.Private:
-                case AccessibilityFilter.Protected:
-                case AccessibilityFilter.Internal:
-                case AccessibilityFilter.Public:
-                    {
-                        valid &= ~all;
-                        break;
-                    }
+                switch (all)
+                {
+                    case AccessibilityFilter.Private:
+                    case AccessibilityFilter.Protected:
+                    case AccessibilityFilter.Internal:
+                    case AccessibilityFilter.Public:
+                        {
+                            valid &= ~all;
+                            break;
+                        }
+                }
             }
 
             return valid;

diff --git a/src/Tests/Refactorings.Tests/RR0186ChangeAccessibilityTests.cs b/src/Tests/Refactorings.Tests/RR0186ChangeAccessibilityTests.cs
@@ -68,6 +68,42 @@ class C
 ", equivalenceKey: EquivalenceKey.Join(RefactoringId, nameof(Accessibility.Public)));
         }
 
+        [Fact, Trait(Traits.Refactoring, RefactoringIdentifiers.ChangeAccessibility)]
+        public async Task Test_MultipleDeclarations_AllImplicit()
+        {
+            await VerifyRefactoringAsync(@"
+class C
+{
+[|    object M1() => null;
+    object M2() => null;|]
+}
+", @"
+class C
+{
+    private object M1() => null;
+    private object M2() => null;
+}
+", equivalenceKey: EquivalenceKey.Join(RefactoringId, nameof(Accessibility.Private)));
+        }
+
+        [Fact, Trait(Traits.Refactoring, RefactoringIdentifiers.ChangeAccessibility)]
+        public async Task Test_MultipleDeclarations_AnyImplicit()
+        {
+            await VerifyRefactoringAsync(@"
+class C
+{
+[|    private object M1() => null;
+    object M2() => null;|]
+}
+", @"
+class C
+{
+    private object M1() => null;
+    private object M2() => null;
+}
+", equivalenceKey: EquivalenceKey.Join(RefactoringId, nameof(Accessibility.Private)));
+        }
+
         [Fact, Trait(Traits.Refactoring, RefactoringIdentifiers.ChangeAccessibility)]
         public async Task TestNoRefactoring_OverrideDeclarationWithoutBaseSource()
         {