From a9434127d221af8e997b6526ead2347e0e5d184d Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sat, 6 Jun 2020 11:42:20 -0700 Subject: [PATCH] Rename --- .../CSharp/Analyzers/CSharpAnalyzers.projitems | 2 +- ...oveConfusingSuppressionDiagnosticAnalyzer.cs} | 8 ++++---- .../CSharp/CodeFixes/CSharpCodeFixes.projitems | 4 ++-- ...RemoveConfusingSuppressionCodeFixProvider.cs} | 10 +++++----- ...pRemoveConfusingSuppressionFixAllProvider.cs} | 8 ++++---- .../Tests/CSharpAnalyzers.UnitTests.projitems | 2 +- .../RemoveConfusingSuppressionTests.cs} | 16 ++++++++-------- src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) rename src/Analyzers/CSharp/Analyzers/{RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer.cs => RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs} (84%) rename src/Analyzers/CSharp/CodeFixes/{RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionCodeFixProvider.cs => RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs} (91%) rename src/Analyzers/CSharp/CodeFixes/{RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionFixAllProvider.cs => RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionFixAllProvider.cs} (77%) rename src/Analyzers/CSharp/Tests/{RemoveUnnecessarySuppression/RemoveUnnecessarySuppressionTests.cs => RemoveConfusingSuppression/RemoveConfusingSuppressionTests.cs} (89%) diff --git a/src/Analyzers/CSharp/Analyzers/CSharpAnalyzers.projitems b/src/Analyzers/CSharp/Analyzers/CSharpAnalyzers.projitems index 5be7327137b..0cee6535cf0 100644 --- a/src/Analyzers/CSharp/Analyzers/CSharpAnalyzers.projitems +++ b/src/Analyzers/CSharp/Analyzers/CSharpAnalyzers.projitems @@ -20,7 +20,7 @@ - + diff --git a/src/Analyzers/CSharp/Analyzers/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs similarity index 84% rename from src/Analyzers/CSharp/Analyzers/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer.cs rename to src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs index 5c10900f7e9..932b9dec586 100644 --- a/src/Analyzers/CSharp/Analyzers/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionDiagnosticAnalyzer.cs @@ -10,13 +10,13 @@ using Microsoft.CodeAnalysis.Diagnostics; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.CSharp.RemoveUnnecessarySuppression +namespace Microsoft.CodeAnalysis.CSharp.RemoveConfusingSuppression { [DiagnosticAnalyzer(LanguageNames.CSharp)] - internal class CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer : AbstractCodeStyleDiagnosticAnalyzer + internal class CSharpRemoveConfusingSuppressionDiagnosticAnalyzer : AbstractCodeStyleDiagnosticAnalyzer { - public CSharpRemoveUnnecessarySuppressionDiagnosticAnalyzer() - : base(IDEDiagnosticIds.RemoveUnnecessarySuppressionForIsExpressionDiagnosticId, + public CSharpRemoveConfusingSuppressionDiagnosticAnalyzer() + : base(IDEDiagnosticIds.RemoveConfusingSuppressionForIsExpressionDiagnosticId, new LocalizableResourceString(nameof(CSharpAnalyzersResources.Remove_unnecessary_suppression_operator), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)), new LocalizableResourceString(nameof(CSharpAnalyzersResources.Suppression_operator_has_no_effect_and_can_be_misinterpreted), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems b/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems index ac5438620b5..5a0f738a9ca 100644 --- a/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems +++ b/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems @@ -30,8 +30,8 @@ - - + + diff --git a/src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs similarity index 91% rename from src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionCodeFixProvider.cs rename to src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs index 0cfcce0d478..4ce53f02a69 100644 --- a/src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionCodeFixProvider.cs +++ b/src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs @@ -20,25 +20,25 @@ using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.CSharp.RemoveUnnecessarySuppression +namespace Microsoft.CodeAnalysis.CSharp.RemoveConfusingSuppression { [ExportCodeFixProvider(LanguageNames.CSharp), Shared] - internal sealed partial class CSharpRemoveUnnecessarySuppressionCodeFixProvider : CodeFixProvider + internal sealed partial class CSharpRemoveConfusingSuppressionCodeFixProvider : CodeFixProvider { public const string RemoveOperator = nameof(RemoveOperator); public const string NegateExpression = nameof(NegateExpression); [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public CSharpRemoveUnnecessarySuppressionCodeFixProvider() + public CSharpRemoveConfusingSuppressionCodeFixProvider() { } public override ImmutableArray FixableDiagnosticIds - => ImmutableArray.Create(IDEDiagnosticIds.RemoveUnnecessarySuppressionForIsExpressionDiagnosticId); + => ImmutableArray.Create(IDEDiagnosticIds.RemoveConfusingSuppressionForIsExpressionDiagnosticId); public override FixAllProvider GetFixAllProvider() - => new CSharpRemoveUnnecessarySuppressionFixAllProvider(); + => new CSharpRemoveConfusingSuppressionFixAllProvider(); public override Task RegisterCodeFixesAsync(CodeFixContext context) { diff --git a/src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionFixAllProvider.cs b/src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionFixAllProvider.cs similarity index 77% rename from src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionFixAllProvider.cs rename to src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionFixAllProvider.cs index a29400a4a84..1698aeb1216 100644 --- a/src/Analyzers/CSharp/CodeFixes/RemoveUnnecessarySuppression/CSharpRemoveUnnecessarySuppressionFixAllProvider.cs +++ b/src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionFixAllProvider.cs @@ -8,13 +8,13 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeFixes; -namespace Microsoft.CodeAnalysis.CSharp.RemoveUnnecessarySuppression +namespace Microsoft.CodeAnalysis.CSharp.RemoveConfusingSuppression { - internal partial class CSharpRemoveUnnecessarySuppressionCodeFixProvider + internal partial class CSharpRemoveConfusingSuppressionCodeFixProvider { - private class CSharpRemoveUnnecessarySuppressionFixAllProvider : DocumentBasedFixAllProvider + private class CSharpRemoveConfusingSuppressionFixAllProvider : DocumentBasedFixAllProvider { - public CSharpRemoveUnnecessarySuppressionFixAllProvider() + public CSharpRemoveConfusingSuppressionFixAllProvider() { } diff --git a/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems b/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems index 669b72496ae..c9f7ea2e702 100644 --- a/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems +++ b/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems @@ -25,7 +25,7 @@ - + diff --git a/src/Analyzers/CSharp/Tests/RemoveUnnecessarySuppression/RemoveUnnecessarySuppressionTests.cs b/src/Analyzers/CSharp/Tests/RemoveConfusingSuppression/RemoveConfusingSuppressionTests.cs similarity index 89% rename from src/Analyzers/CSharp/Tests/RemoveUnnecessarySuppression/RemoveUnnecessarySuppressionTests.cs rename to src/Analyzers/CSharp/Tests/RemoveConfusingSuppression/RemoveConfusingSuppressionTests.cs index 7430e8b2d69..ca3ac242871 100644 --- a/src/Analyzers/CSharp/Tests/RemoveUnnecessarySuppression/RemoveUnnecessarySuppressionTests.cs +++ b/src/Analyzers/CSharp/Tests/RemoveConfusingSuppression/RemoveConfusingSuppressionTests.cs @@ -4,17 +4,17 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.RemoveUnnecessarySuppression; +using Microsoft.CodeAnalysis.CSharp.RemoveConfusingSuppression; using Microsoft.CodeAnalysis.CSharp.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions; using Roslyn.Test.Utilities; using Xunit; -namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.RemoveUnnecessarySuppression +namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Confusing { - using VerifyCS = CSharpCodeFixVerifier; + using VerifyCS = CSharpCodeFixVerifier; - public class RemoveUnnecessarySuppressionTests + public class RemoveConfusingSuppressionTests { [Fact, WorkItem(44872, "https://github.com/dotnet/roslyn/issues/44872")] public async Task TestRemoveWithIsExpression1() @@ -240,7 +240,7 @@ void M(object o) } }", NumberOfFixAllIterations = 1, - CodeActionEquivalenceKey = CSharpRemoveUnnecessarySuppressionCodeFixProvider.RemoveOperator, + CodeActionEquivalenceKey = CSharpRemoveConfusingSuppressionCodeFixProvider.RemoveOperator, }.RunAsync(); } @@ -278,7 +278,7 @@ void M(object o) } }", CodeActionIndex = 1, - CodeActionEquivalenceKey = CSharpRemoveUnnecessarySuppressionCodeFixProvider.NegateExpression, + CodeActionEquivalenceKey = CSharpRemoveConfusingSuppressionCodeFixProvider.NegateExpression, NumberOfFixAllIterations = 1, }.RunAsync(); } @@ -317,7 +317,7 @@ void M(object o) } }", NumberOfFixAllIterations = 1, - CodeActionEquivalenceKey = CSharpRemoveUnnecessarySuppressionCodeFixProvider.RemoveOperator, + CodeActionEquivalenceKey = CSharpRemoveConfusingSuppressionCodeFixProvider.RemoveOperator, }.RunAsync(); } @@ -356,7 +356,7 @@ void M(object o) }", NumberOfFixAllIterations = 1, CodeActionIndex = 1, - CodeActionEquivalenceKey = CSharpRemoveUnnecessarySuppressionCodeFixProvider.NegateExpression, + CodeActionEquivalenceKey = CSharpRemoveConfusingSuppressionCodeFixProvider.NegateExpression, }.RunAsync(); } } diff --git a/src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs b/src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs index 3d5f81deeb5..cc9aabab9ac 100644 --- a/src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs +++ b/src/Analyzers/Core/Analyzers/IDEDiagnosticIds.cs @@ -133,7 +133,7 @@ internal static class IDEDiagnosticIds public const string InvalidSuppressMessageAttributeDiagnosticId = "IDE0076"; public const string LegacyFormatSuppressMessageAttributeDiagnosticId = "IDE0077"; - public const string RemoveUnnecessarySuppressionForIsExpressionDiagnosticId = "IDE0080"; + public const string RemoveConfusingSuppressionForIsExpressionDiagnosticId = "IDE0080"; // Analyzer error Ids public const string AnalyzerChangedId = "IDE1001"; -- GitLab