Fix refactoring 'Change accessibility' (RR0186) (#1599)

dotnet · Dec 21, 2024 · 498bb29 · 498bb29
1 parent c2b1f46
commit 498bb29
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix refactoring 'Change accessibility' ([RR0186](https://josefpihrt.github.io/docs/roslynator/refactorings/RR0186)) ([PR](https://github.com/dotnet/roslynator/pull/1599))
+
 ### Changed
 
 - Move `DiagnosticRules` and `DiagnosticIdentifiers` to `Roslynator.Common` ([PR](https://github.com/dotnet/roslynator/pull/1597))

diff --git a/src/Refactorings/CSharp/Refactorings/AccessModifierRefactoring.cs b/src/Refactorings/CSharp/Refactorings/AccessModifierRefactoring.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
@@ -39,9 +40,17 @@ public static async Task ComputeRefactoringsAsync(RefactoringContext context, Sy
 
             if (syntaxReferences.Length > 1)
             {
-                ImmutableArray<MemberDeclarationSyntax> memberDeclarations = ImmutableArray.CreateRange(
-                    syntaxReferences,
-                    f => (MemberDeclarationSyntax)f.GetSyntax(context.CancellationToken));
+                ImmutableArray<MemberDeclarationSyntax>.Builder memberDeclarations = ImmutableArray.CreateBuilder<MemberDeclarationSyntax>();
+
+                foreach (SyntaxReference syntaxReference in syntaxReferences)
+                {
+                    SyntaxNode declaration = await syntaxReference.GetSyntaxAsync(context.CancellationToken).ConfigureAwait(false);
+
+                    if (node.RawKind != declaration.RawKind)
+                        return;
+
+                    memberDeclarations.Add((MemberDeclarationSyntax)declaration);
+                }
 
                 ImmutableArray<CodeAction>.Builder typeDeclarationActions = ImmutableArray.CreateBuilder<CodeAction>();
 
@@ -52,7 +61,7 @@ public static async Task ComputeRefactoringsAsync(RefactoringContext context, Sy
                     {
                         typeDeclarationActions.Add(CodeActionFactory.Create(
                             SyntaxFacts.GetText(accessibility),
-                            ct => RefactorAsync(context.Solution, memberDeclarations, accessibility, ct),
+                            ct => RefactorAsync(context.Solution, memberDeclarations.ToImmutable(), accessibility, ct),
                             RefactoringDescriptors.ChangeAccessibility,
                             accessibility.ToString()));
                     }

diff --git a/src/Tests/Refactorings.Tests/RR0186ChangeAccessibilityTests.cs b/src/Tests/Refactorings.Tests/RR0186ChangeAccessibilityTests.cs
@@ -163,4 +163,17 @@ class C : B
     [||]public override string M() => null;
 }", equivalenceKey: EquivalenceKey.Create(RefactoringId, nameof(Accessibility.Private)));
     }
+
+    [Fact, Trait(Traits.Refactoring, RefactoringIdentifiers.ChangeAccessibility)]
+    public async Task Test_InvalidCode()
+    {
+        await VerifyNoRefactoringAsync("""
+[||]internal class Program;
+{
+    static void Main(string[] args)
+    {
+    }
+}
+""", equivalenceKey: EquivalenceKey.Create(RefactoringId, nameof(Accessibility.Internal)), options: Options.AddAllowedCompilerDiagnosticIds(["CS8803", "CS0260", "CS7022"]));
+    }
 }