[automated] Merge branch 'main' => 'release/dev18.0'

docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md

@@ -35,7 +35,7 @@ public class C
 ***Introduced in Visual Studio 2022 version 17.10***
 
 *Conversion* of a collection expression to a `struct` or `class` that implements `System.Collections.IEnumerable` and *does not* have a strongly-typed `GetEnumerator()`
-requires the elements in the collection expression are implicitly convertible to the `object`.
+requires that the elements in the collection expression are implicitly convertible to `object`.
 Previously, the elements of a collection expression targeting an `IEnumerable` implementation were assumed to be convertible to `object`, and converted only when binding to the applicable `Add` method.
 
 This additional requirement means that collection expression conversions to `IEnumerable` implementations are treated consistently with other target types where the elements in the collection expression must be implicitly convertible to the *iteration type* of the target type.

docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md

@@ -157,3 +157,30 @@ class C
 ```
 
 A workaround is to use explicit delegate types instead of relying on `var` inference in those cases.
+
+## `dotnet_style_require_accessibility_modifiers` now consistently applies to interface members
+
+PR: https://github.com/dotnet/roslyn/pull/76324
+
+Prior to this change, the analyzer for dotnet_style_require_accessibility_modifiers would simply ignore interface
+members.  This was because C# initially disallowed modifiers for interface members entirely, having them always
+be public.
+
+Later versions of the language relaxed this restriction, allowing users to provide accessibility modifiers on
+interface members, including a redundant `public` modifier.
+
+The analyzer was updated to now enforce the value for this option on interface members as well.  The meaning
+of the value is as follows:
+
+1. `never`.  The analyzer does no analysis.  Redundant modifiers are allowed on all members.
+2. `always`.  Redundant modifiers are always required on all members (including interface members).  For example:
+   a `private` modifier on a class member, and a `public` modifier on an interface member.  This is the option to
+   use if you feel that all members no matter what should state their accessibility explicitly.
+4. `for_non_interface_members`.  Redundant modifiers are required on all members *that are not* part of an interface,
+   but disallowed for interface members. For example: `private` will be required on private class members.  However,
+   a public interface member will not be allowed to have redundant `public` modifiers.  This matches the standard
+   modifier approach present prior to the language allowing modifiers on interface members.
+5. `omit_if_default`.  Redundant modifiers are disallowed.  For example a private class member will be disallowed from
+   using `private`, and a public interface member will be disallowed from using `public`.  This is the option to use
+   if you feel that restating the accessibility when it matches what the language chooses by default is redundant and
+   should be disalloed.

eng/Version.Details.xml

@@ -122,19 +122,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
+      <Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25077.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25111.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
+      <Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25077.4">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25111.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
+      <Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
       <Uri>https://github.com/dotnet/symreader</Uri>
@@ -150,9 +150,9 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25077.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
+      <Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

eng/config/PublishData.json

@@ -263,7 +263,7 @@
       "vsBranch": "dev/monicaro/versioning",
       "vsMajorVersion": 18,
       "insertionTitlePrefix": "[d18.0 P1]",
-      "insertionCreateDraftPR": false
+      "insertionCreateDraftPR": true
     },
     "main": {
       "nugetKind": [

global.json

@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "9.0.102",
+    "version": "9.0.103",
     "allowPrerelease": false,
     "rollForward": "patch"
   },
   "tools": {
-    "dotnet": "9.0.102",
+    "dotnet": "9.0.103",
     "vs": {
       "version": "17.8.0"
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
     "Microsoft.Build.Traversal": "3.4.0"
   }
 }

src/Analyzers/CSharp/Analyzers/AddAccessibilityModifiers/CSharpAddAccessibilityModifiers.cs

@@ -2,21 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.LanguageService;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 
-internal class CSharpAddAccessibilityModifiers : AbstractAddAccessibilityModifiers<MemberDeclarationSyntax>
+internal class CSharpAddOrRemoveAccessibilityModifiers : AbstractAddOrRemoveAccessibilityModifiers<MemberDeclarationSyntax>
 {
-    public static readonly CSharpAddAccessibilityModifiers Instance = new();
+    public static readonly CSharpAddOrRemoveAccessibilityModifiers Instance = new();
 
-    protected CSharpAddAccessibilityModifiers()
+    protected CSharpAddOrRemoveAccessibilityModifiers()
     {
     }
 

src/Analyzers/CSharp/Analyzers/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersDiagnosticAnalyzer.cs

@@ -2,21 +2,22 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.CodeStyle;
-using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.LanguageService;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.LanguageService;
 
-namespace Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-internal class CSharpAddAccessibilityModifiersDiagnosticAnalyzer
-    : AbstractAddAccessibilityModifiersDiagnosticAnalyzer<CompilationUnitSyntax>
+internal sealed class CSharpAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer
+    : AbstractAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer<CompilationUnitSyntax>
 {
+    protected override IAccessibilityFacts AccessibilityFacts => CSharpAccessibilityFacts.Instance;
+    protected override IAddOrRemoveAccessibilityModifiers AddOrRemoveAccessibilityModifiers => CSharpAddOrRemoveAccessibilityModifiers.Instance;
+
     protected override void ProcessCompilationUnit(
         SyntaxTreeAnalysisContext context,
         CodeStyleOption2<AccessibilityModifiersRequired> option, CompilationUnitSyntax compilationUnit)
@@ -47,20 +48,6 @@ private void ProcessMemberDeclaration(
         if (member is TypeDeclarationSyntax typeDeclaration)
             ProcessMembers(context, option, typeDeclaration.Members);
 
-        if (!CSharpAddAccessibilityModifiers.Instance.ShouldUpdateAccessibilityModifier(
-                CSharpAccessibilityFacts.Instance, member, option.Value, out var name, out var modifiersAdded))
-        {
-            return;
-        }
-
-        // Have an issue to flag, either add or remove. Report issue to user.
-        var additionalLocations = ImmutableArray.Create(member.GetLocation());
-        context.ReportDiagnostic(DiagnosticHelper.Create(
-            Descriptor,
-            name.GetLocation(),
-            option.Notification,
-            context.Options,
-            additionalLocations: additionalLocations,
-            modifiersAdded ? ModifiersAddedProperties : null));
+        CheckMemberAndReportDiagnostic(context, option, member);
     }
 }

src/Analyzers/CSharp/CodeFixes/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersCodeFixProvider.cs

@@ -4,16 +4,16 @@
 
 using System.Composition;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 
-[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddAccessibilityModifiers), Shared]
+[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddOrRemoveAccessibilityModifiers), Shared]
 [method: ImportingConstructor]
 [method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
-internal sealed class CSharpAddAccessibilityModifiersCodeFixProvider() : AbstractAddAccessibilityModifiersCodeFixProvider
+internal sealed class CSharpAddOrRemoveAccessibilityModifiersCodeFixProvider() : AbstractAddOrRemoveAccessibilityModifiersCodeFixProvider
 {
     protected override SyntaxNode MapToDeclarator(SyntaxNode node)
     {

src/Analyzers/CSharp/CodeFixes/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersService.cs

@@ -4,12 +4,12 @@
 
 using System;
 using System.Composition;
-using Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 
-[ExportLanguageService(typeof(IAddAccessibilityModifiersService), LanguageNames.CSharp), Shared]
+[ExportLanguageService(typeof(IAddOrRemoveAccessibilityModifiersService), LanguageNames.CSharp), Shared]
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-internal sealed class CSharpAddAccessibilityModifiersService() : CSharpAddAccessibilityModifiers, IAddAccessibilityModifiersService;
+internal sealed class CSharpAddOrRemoveAccessibilityModifiersService() : CSharpAddOrRemoveAccessibilityModifiers, IAddOrRemoveAccessibilityModifiersService;

src/Analyzers/CSharp/Tests/AddAccessibilityModifiers/AddAccessibilityModifiersFixAllTests.cs

@@ -6,26 +6,26 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddOrRemoveAccessibilityModifiers;
 
-[Trait(Traits.Feature, Traits.Features.CodeActionsAddAccessibilityModifiers)]
-public class AddAccessibilityModifiersFixAllTests : AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest_NoEditor
+[Trait(Traits.Feature, Traits.Features.CodeActionsAddOrRemoveAccessibilityModifiers)]
+public class AddOrRemoveAccessibilityModifiersFixAllTests : AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest_NoEditor
 {
-    public AddAccessibilityModifiersFixAllTests(ITestOutputHelper logger)
+    public AddOrRemoveAccessibilityModifiersFixAllTests(ITestOutputHelper logger)
        : base(logger)
     {
     }
 
     internal override (DiagnosticAnalyzer, CodeFixProvider) CreateDiagnosticProviderAndFixer(Workspace workspace)
-        => (new CSharpAddAccessibilityModifiersDiagnosticAnalyzer(), new CSharpAddAccessibilityModifiersCodeFixProvider());
+        => (new CSharpAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer(), new CSharpAddOrRemoveAccessibilityModifiersCodeFixProvider());
 
     [Fact, WorkItem("https://github.com/dotnet/vscode-csharp/issues/6611")]
     [Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]

src/Analyzers/CSharp/Tests/AddAccessibilityModifiers/AddAccessibilityModifiersTests.cs

@@ -5,20 +5,20 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
+using Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddOrRemoveAccessibilityModifiers;
 
 using VerifyCS = CSharpCodeFixVerifier<
-    CSharpAddAccessibilityModifiersDiagnosticAnalyzer,
-    CSharpAddAccessibilityModifiersCodeFixProvider>;
+    CSharpAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer,
+    CSharpAddOrRemoveAccessibilityModifiersCodeFixProvider>;
 
-[Trait(Traits.Feature, Traits.Features.CodeActionsAddAccessibilityModifiers)]
-public sealed class AddAccessibilityModifiersTests
+[Trait(Traits.Feature, Traits.Features.CodeActionsAddOrRemoveAccessibilityModifiers)]
+public sealed class AddOrRemoveAccessibilityModifiersTests
 {
     [Theory, CombinatorialData]
     public void TestStandardProperty(AnalyzerProperty property)

src/Analyzers/Core/Analyzers/AddAccessibilityModifiers/AbstractAddAccessibilityModifiers.cs

@@ -5,9 +5,9 @@
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.LanguageService;
 
-namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 
-internal abstract class AbstractAddAccessibilityModifiers<TMemberDeclarationSyntax> : IAddAccessibilityModifiers
+internal abstract class AbstractAddOrRemoveAccessibilityModifiers<TMemberDeclarationSyntax> : IAddOrRemoveAccessibilityModifiers
     where TMemberDeclarationSyntax : SyntaxNode
 {
     public bool ShouldUpdateAccessibilityModifier(

src/Analyzers/Core/Analyzers/AddAccessibilityModifiers/AbstractAddAccessibilityModifiersDiagnosticAnalyzer.cs

@@ -5,20 +5,33 @@
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.LanguageService;
 
-namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 
-internal abstract class AbstractAddAccessibilityModifiersDiagnosticAnalyzer<TCompilationUnitSyntax>()
+internal abstract class AbstractAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer<TCompilationUnitSyntax>()
     : AbstractBuiltInCodeStyleDiagnosticAnalyzer(
-        IDEDiagnosticIds.AddAccessibilityModifiersDiagnosticId,
-        EnforceOnBuildValues.AddAccessibilityModifiers,
+        IDEDiagnosticIds.AddOrRemoveAccessibilityModifiersDiagnosticId,
+        EnforceOnBuildValues.AddOrRemoveAccessibilityModifiers,
         CodeStyleOptions2.AccessibilityModifiersRequired,
         new LocalizableResourceString(nameof(AnalyzersResources.Add_accessibility_modifiers), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
         new LocalizableResourceString(nameof(AnalyzersResources.Accessibility_modifiers_required), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)))
     where TCompilationUnitSyntax : SyntaxNode
 {
+    protected abstract IAccessibilityFacts AccessibilityFacts { get; }
+    protected abstract IAddOrRemoveAccessibilityModifiers AddOrRemoveAccessibilityModifiers { get; }
+
+    protected abstract void ProcessCompilationUnit(SyntaxTreeAnalysisContext context, CodeStyleOption2<AccessibilityModifiersRequired> option, TCompilationUnitSyntax compilationUnitSyntax);
+
+    protected readonly DiagnosticDescriptor ModifierRemovedDescriptor = CreateDescriptorWithId(
+        IDEDiagnosticIds.AddOrRemoveAccessibilityModifiersDiagnosticId,
+        EnforceOnBuildValues.AddOrRemoveAccessibilityModifiers,
+        hasAnyCodeStyleOption: true,
+        new LocalizableResourceString(nameof(AnalyzersResources.Remove_accessibility_modifiers), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
+        new LocalizableResourceString(nameof(AnalyzersResources.Accessibility_modifiers_unnecessary), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)));
+
     protected static readonly ImmutableDictionary<string, string?> ModifiersAddedProperties = ImmutableDictionary<string, string?>.Empty.Add(
-        AddAccessibilityModifiersConstants.ModifiersAdded, AddAccessibilityModifiersConstants.ModifiersAdded);
+        AddOrRemoveAccessibilityModifiersConstants.ModifiersAdded, AddOrRemoveAccessibilityModifiersConstants.ModifiersAdded);
 
     public sealed override DiagnosticAnalyzerCategory GetAnalyzerCategory()
         => DiagnosticAnalyzerCategory.SyntaxTreeWithoutSemanticsAnalysis;
@@ -39,5 +52,25 @@ private void AnalyzeTree(SyntaxTreeAnalysisContext context, CompilationOptions c
         ProcessCompilationUnit(context, option, (TCompilationUnitSyntax)context.Tree.GetRoot(context.CancellationToken));
     }
 
-    protected abstract void ProcessCompilationUnit(SyntaxTreeAnalysisContext context, CodeStyleOption2<AccessibilityModifiersRequired> option, TCompilationUnitSyntax compilationUnitSyntax);
+    protected void CheckMemberAndReportDiagnostic(
+        SyntaxTreeAnalysisContext context,
+        CodeStyleOption2<AccessibilityModifiersRequired> option,
+        SyntaxNode member)
+    {
+        if (!this.AddOrRemoveAccessibilityModifiers.ShouldUpdateAccessibilityModifier(
+                this.AccessibilityFacts, member, option.Value, out var name, out var modifiersAdded))
+        {
+            return;
+        }
+
+        // Have an issue to flag, either add or remove. Report issue to user.
+        var additionalLocations = ImmutableArray.Create(member.GetLocation());
+        context.ReportDiagnostic(DiagnosticHelper.Create(
+            modifiersAdded ? Descriptor : ModifierRemovedDescriptor,
+            name.GetLocation(),
+            option.Notification,
+            context.Options,
+            additionalLocations: additionalLocations,
+            modifiersAdded ? ModifiersAddedProperties : null));
+    }
 }

src/Analyzers/Core/Analyzers/AddAccessibilityModifiers/IAddAccessibilityModifiersService.cs

@@ -5,14 +5,14 @@
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.LanguageService;
 
-namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
+namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;
 
-internal static partial class AddAccessibilityModifiersConstants
+internal static partial class AddOrRemoveAccessibilityModifiersConstants
 {
     public const string ModifiersAdded = nameof(ModifiersAdded);
 }
 
-internal interface IAddAccessibilityModifiers
+internal interface IAddOrRemoveAccessibilityModifiers
 {
     bool ShouldUpdateAccessibilityModifier(
         IAccessibilityFacts accessibilityFacts,