Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename feature to 'Add or remove accessibility modifiers' #77234

Merged
merged 8 commits into from
Feb 15, 2025
Merged

Rename feature to 'Add or remove accessibility modifiers' #77234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c29926
Rename feature to 'Add or remove accessibility modifiers'
CyrusNajmabadi Feb 14, 2025
dbad668
Cleanup and revert
CyrusNajmabadi Feb 14, 2025
7c437ed
Revert
CyrusNajmabadi Feb 14, 2025
00718bf
Fix
CyrusNajmabadi Feb 14, 2025
9bd6246
Add test
CyrusNajmabadi Feb 14, 2025
add6035
Merge branch 'main' into addOrRemove
CyrusNajmabadi Feb 14, 2025
15a63a1
revert
CyrusNajmabadi Feb 14, 2025
c93ec5f
remove import
CyrusNajmabadi Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Analyzers/CSharp/Analyzers/AddAccessibilityModifiers/CSharpAddAccessibilityModifiers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update the file names too. Or maybe just run the fixup on our entire codebase and see what it discovers. 😄

{
public static readonly CSharpAddAccessibilityModifiers Instance = new();
public static readonly CSharpAddOrRemoveAccessibilityModifiers Instance = new();

protected CSharpAddAccessibilityModifiers()
protected CSharpAddOrRemoveAccessibilityModifiers()
{
}

Expand Down
10 changes: 5 additions & 5 deletions .../Analyzers/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersDiagnosticAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.LanguageService;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.LanguageService;

namespace Microsoft.CodeAnalysis.CSharp.AddAccessibilityModifiers;
namespace Microsoft.CodeAnalysis.CSharp.AddOrRemoveAccessibilityModifiers;

[DiagnosticAnalyzer(LanguageNames.CSharp)]
internal sealed class CSharpAddAccessibilityModifiersDiagnosticAnalyzer
: AbstractAddAccessibilityModifiersDiagnosticAnalyzer<CompilationUnitSyntax>
internal sealed class CSharpAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer
: AbstractAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer<CompilationUnitSyntax>
{
protected override IAccessibilityFacts AccessibilityFacts => CSharpAccessibilityFacts.Instance;
protected override IAddAccessibilityModifiers AddAccessibilityModifiers => CSharpAddAccessibilityModifiers.Instance;
protected override IAddOrRemoveAccessibilityModifiers AddOrRemoveAccessibilityModifiers => CSharpAddOrRemoveAccessibilityModifiers.Instance;

protected override void ProcessCompilationUnit(
SyntaxTreeAnalysisContext context,
Expand Down
8 changes: 4 additions & 4 deletions ...arp/CodeFixes/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions ...zers/CSharp/CodeFixes/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
12 changes: 6 additions & 6 deletions src/Analyzers/CSharp/Tests/AddAccessibilityModifiers/AddAccessibilityModifiersFixAllTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
12 changes: 6 additions & 6 deletions src/Analyzers/CSharp/Tests/AddAccessibilityModifiers/AddAccessibilityModifiersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/Analyzers/Core/Analyzers/AddAccessibilityModifiers/AbstractAddAccessibilityModifiers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
18 changes: 9 additions & 9 deletions ...nalyzers/AddAccessibilityModifiers/AbstractAddAccessibilityModifiersDiagnosticAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@
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 IAddAccessibilityModifiers AddAccessibilityModifiers { get; }
protected abstract IAddOrRemoveAccessibilityModifiers AddOrRemoveAccessibilityModifiers { get; }

protected abstract void ProcessCompilationUnit(SyntaxTreeAnalysisContext context, CodeStyleOption2<AccessibilityModifiersRequired> option, TCompilationUnitSyntax compilationUnitSyntax);

protected readonly DiagnosticDescriptor ModifierRemovedDescriptor = CreateDescriptorWithId(
IDEDiagnosticIds.AddAccessibilityModifiersDiagnosticId,
EnforceOnBuildValues.AddAccessibilityModifiers,
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;
Expand All @@ -57,7 +57,7 @@ protected void CheckMemberAndReportDiagnostic(
CodeStyleOption2<AccessibilityModifiersRequired> option,
SyntaxNode member)
{
if (!this.AddAccessibilityModifiers.ShouldUpdateAccessibilityModifier(
if (!this.AddOrRemoveAccessibilityModifiers.ShouldUpdateAccessibilityModifier(
this.AccessibilityFacts, member, option.Value, out var name, out var modifiersAdded))
{
return;
Expand Down
6 changes: 3 additions & 3 deletions src/Analyzers/Core/Analyzers/AddAccessibilityModifiers/IAddAccessibilityModifiersService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Core/Analyzers/EnforceOnBuildValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ internal static class EnforceOnBuildValues
public const EnforceOnBuild UseExplicitType = /*IDE0008*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild AddBraces = /*IDE0011*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild OrderModifiers = /*IDE0036*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild AddAccessibilityModifiers = /*IDE0040*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild AddOrRemoveAccessibilityModifiers = /*IDE0040*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild ValidateFormatString = /*IDE0043*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild MakeFieldReadonly = /*IDE0044*/ EnforceOnBuild.HighlyRecommended;
public const EnforceOnBuild RemoveUnusedMembers = /*IDE0051*/ EnforceOnBuild.HighlyRecommended;
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal static class IDEDiagnosticIds

public const string UseLocalFunctionDiagnosticId = "IDE0039";

public const string AddAccessibilityModifiersDiagnosticId = "IDE0040";
public const string AddOrRemoveAccessibilityModifiersDiagnosticId = "IDE0040";

public const string UseIsNullCheckDiagnosticId = "IDE0041";

Expand Down
10 changes: 5 additions & 5 deletions ...e/CodeFixes/AddAccessibilityModifiers/AbstractAddAccessibilityModifiersCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
using Microsoft.CodeAnalysis.Shared.Extensions;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;

internal abstract class AbstractAddAccessibilityModifiersCodeFixProvider : SyntaxEditorBasedCodeFixProvider
internal abstract class AbstractAddOrRemoveAccessibilityModifiersCodeFixProvider : SyntaxEditorBasedCodeFixProvider
{
protected abstract SyntaxNode MapToDeclarator(SyntaxNode declaration);

public sealed override ImmutableArray<string> FixableDiagnosticIds
=> [IDEDiagnosticIds.AddAccessibilityModifiersDiagnosticId];
=> [IDEDiagnosticIds.AddOrRemoveAccessibilityModifiersDiagnosticId];

public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
{
Expand All @@ -31,7 +31,7 @@ public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
? CodeActionPriority.Low
: CodeActionPriority.Default;

var (title, key) = diagnostic.Properties.ContainsKey(AddAccessibilityModifiersConstants.ModifiersAdded)
var (title, key) = diagnostic.Properties.ContainsKey(AddOrRemoveAccessibilityModifiersConstants.ModifiersAdded)
? (AnalyzersResources.Add_accessibility_modifiers, nameof(AnalyzersResources.Add_accessibility_modifiers))
: (AnalyzersResources.Remove_accessibility_modifiers, nameof(AnalyzersResources.Remove_accessibility_modifiers));

Expand All @@ -52,7 +52,7 @@ protected sealed override async Task FixAllAsync(
var declarator = MapToDeclarator(declaration);
var symbol = semanticModel.GetDeclaredSymbol(declarator, cancellationToken);
Contract.ThrowIfNull(symbol);
AddAccessibilityModifiersHelpers.UpdateDeclaration(editor, symbol, declaration);
AddOrRemoveAccessibilityModifiersHelpers.UpdateDeclaration(editor, symbol, declaration);
}
}
}
4 changes: 2 additions & 2 deletions src/Analyzers/Core/CodeFixes/AddAccessibilityModifiers/AddAccessibilityModifiersHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
using Microsoft.CodeAnalysis.Shared.Extensions;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;

internal static partial class AddAccessibilityModifiersHelpers
internal static partial class AddOrRemoveAccessibilityModifiersHelpers
{
public static void UpdateDeclaration(
SyntaxEditor editor, ISymbol symbol, SyntaxNode declaration)
Expand Down
4 changes: 2 additions & 2 deletions src/Analyzers/Core/CodeFixes/AddAccessibilityModifiers/IAddAccessibilityModifiersService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

using Microsoft.CodeAnalysis.Host;

namespace Microsoft.CodeAnalysis.AddAccessibilityModifiers;
namespace Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers;

internal interface IAddAccessibilityModifiersService : IAddAccessibilityModifiers, ILanguageService
internal interface IAddOrRemoveAccessibilityModifiersService : IAddOrRemoveAccessibilityModifiers, ILanguageService
{
}
2 changes: 1 addition & 1 deletion src/Analyzers/Core/CodeFixes/PredefinedCodeFixProviderNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Microsoft.CodeAnalysis.CodeFixes;

internal static class PredefinedCodeFixProviderNames
{
public const string AddAccessibilityModifiers = nameof(AddAccessibilityModifiers);
public const string AddOrRemoveAccessibilityModifiers = nameof(AddOrRemoveAccessibilityModifiers);
public const string AddAnonymousTypeMemberName = nameof(AddAnonymousTypeMemberName);
public const string AddAsync = nameof(AddAsync);
public const string AddBraces = nameof(AddBraces);
Expand Down
10 changes: 5 additions & 5 deletions ...s/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiers.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.

Imports Microsoft.CodeAnalysis.AddAccessibilityModifiers
Imports Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers
Imports Microsoft.CodeAnalysis.CodeStyle
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

Namespace Microsoft.CodeAnalysis.VisualBasic.AddAccessibilityModifiers
Friend Class VisualBasicAddAccessibilityModifiers
Inherits AbstractAddAccessibilityModifiers(Of StatementSyntax)
Namespace Microsoft.CodeAnalysis.VisualBasic.AddOrRemoveAccessibilityModifiers
Friend Class VisualBasicAddOrRemoveAccessibilityModifiers
Inherits AbstractAddOrRemoveAccessibilityModifiers(Of StatementSyntax)

Public Shared ReadOnly Instance As New VisualBasicAddAccessibilityModifiers()
Public Shared ReadOnly Instance As New VisualBasicAddOrRemoveAccessibilityModifiers()

Protected Sub New()
End Sub
Expand Down
10 changes: 5 additions & 5 deletions ...yzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.

Imports Microsoft.CodeAnalysis.AddAccessibilityModifiers
Imports Microsoft.CodeAnalysis.AddOrRemoveAccessibilityModifiers
Imports Microsoft.CodeAnalysis.CodeStyle
Imports Microsoft.CodeAnalysis.Diagnostics
Imports Microsoft.CodeAnalysis.LanguageService
Imports Microsoft.CodeAnalysis.VisualBasic.LanguageService
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

Namespace Microsoft.CodeAnalysis.VisualBasic.AddAccessibilityModifiers
Namespace Microsoft.CodeAnalysis.VisualBasic.AddOrRemoveAccessibilityModifiers
<DiagnosticAnalyzer(LanguageNames.VisualBasic)>
Friend NotInheritable Class VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer
Inherits AbstractAddAccessibilityModifiersDiagnosticAnalyzer(Of CompilationUnitSyntax)
Friend NotInheritable Class VisualBasicAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer
Inherits AbstractAddOrRemoveAccessibilityModifiersDiagnosticAnalyzer(Of CompilationUnitSyntax)

Protected Overrides ReadOnly Property AccessibilityFacts As IAccessibilityFacts = VisualBasicAccessibilityFacts.Instance
Protected Overrides ReadOnly Property AddAccessibilityModifiers As IAddAccessibilityModifiers = VisualBasicAddAccessibilityModifiers.Instance
Protected Overrides ReadOnly Property AddOrRemoveAccessibilityModifiers As IAddOrRemoveAccessibilityModifiers = VisualBasicAddOrRemoveAccessibilityModifiers.Instance

Protected Overrides Sub ProcessCompilationUnit(
context As SyntaxTreeAnalysisContext,
Expand Down
Loading