Merge branch 'main' into feature/trailing-comma

dotnet · Aug 18, 2023 · c444443 · c444443
2 parents e5926ed + 9f3f946
commit c444443
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 667 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -42,7 +42,6 @@ roslynator_doc_comment_summary_style = multi_line
 roslynator_enum_flag_value_style = shift_operator
 roslynator_blank_line_after_file_scoped_namespace_declaration = true
 roslynator_null_check_style = pattern_matching
-roslynator_trailing_comma_style = include
 
 dotnet_diagnostic.RCS0001.severity = suggestion
 dotnet_diagnostic.RCS0003.severity = suggestion
@@ -143,7 +142,6 @@ dotnet_diagnostic.RCS1252.severity = suggestion
 dotnet_diagnostic.RCS1253.severity = suggestion
 dotnet_diagnostic.RCS1254.severity = suggestion
 dotnet_diagnostic.RCS1255.severity = none
-dotnet_diagnostic.RCS1256.severity = suggestion
 
 dotnet_diagnostic.IDE0007.severity = none
 dotnet_diagnostic.IDE0007WithoutSuggestion.severity = none

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -104,9 +104,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - annotated as nullable reference type.
     - optional and its default value is `null`.
 - Add package `Roslynator.Testing.CSharp.MSTest` ([#997](https://github.com/JosefPihrt/Roslynator/pull/997)).
-- Add analyzer "Include/omit trailing comma" ([RCS1256](https://github.com/JosefPihrt/Roslynator/blob/main/docs/analyzers/RCS1256.md)) ([#931](https://github.com/JosefPihrt/Roslynator/pull/931)).
-  - Required option: `roslynator_trailing_comma_style = include|omit`
-  - Not enabled by default
 
 ### Changed
 

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/AddOrRemoveTrailingCommaCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/AddOrRemoveTrailingCommaCodeFixProvider.cs
diff --git a/src/Analyzers.xml b/src/Analyzers.xml
@@ -2335,13 +2335,10 @@ if (f)
   <Analyzer>
     <Id>RCS1035</Id>
     <Identifier>RemoveRedundantCommaInInitializer</Identifier>
-    <Status>Obsolete</Status>
-    <ObsoleteMessage>Use RCS1259 instead</ObsoleteMessage>
     <Title>Remove redundant comma in initializer.</Title>
     <DefaultSeverity>Hidden</DefaultSeverity>
     <IsEnabledByDefault>false</IsEnabledByDefault>
     <SupportsFadeOut>true</SupportsFadeOut>
-    <Tags>HideFromConfiguration</Tags>
     <Samples>
       <Sample>
         <Before><![CDATA[public void Foo()

diff --git a/src/Analyzers/AddOrRemoveTrailingComma.Analyzers.xml b/src/Analyzers/AddOrRemoveTrailingComma.Analyzers.xml
diff --git a/src/Analyzers/CSharp/Analysis/AddOrRemoveTrailingCommaAnalyzer.cs b/src/Analyzers/CSharp/Analysis/AddOrRemoveTrailingCommaAnalyzer.cs
diff --git a/src/Analyzers/CSharp/DiagnosticIdentifiers.Generated.cs b/src/Analyzers/CSharp/DiagnosticIdentifiers.Generated.cs
@@ -213,6 +213,5 @@ public static partial class DiagnosticIdentifiers
         public const string NormalizeFormatOfEnumFlagValue = "RCS1254";
         public const string SimplifyArgumentNullCheck = "RCS1255";
         public const string InvalidArgumentNullCheck = "RCS1256";
-        public const string AddOrRemoveTrailingComma = "RCS1259";
     }
 }
diff --git a/src/Analyzers/CSharp/DiagnosticRules.Generated.cs b/src/Analyzers/CSharp/DiagnosticRules.Generated.cs
@@ -305,7 +305,7 @@ public static partial class DiagnosticRules
         public static readonly DiagnosticDescriptor RemoveRedundantCommaInInitializer = DiagnosticDescriptorFactory.Create(
             id:                 DiagnosticIdentifiers.RemoveRedundantCommaInInitializer, 
             title:              "Remove redundant comma in initializer.", 
-            messageFormat:      "([deprecated] Use RCS1259 instead)Remove redundant comma in initializer.", 
+            messageFormat:      "Remove redundant comma in initializer.", 
             category:           DiagnosticCategories.Roslynator, 
             defaultSeverity:    DiagnosticSeverity.Hidden, 
             isEnabledByDefault: false, 
@@ -2521,17 +2521,5 @@ public static partial class DiagnosticRules
             helpLinkUri:        DiagnosticIdentifiers.InvalidArgumentNullCheck, 
             customTags:         Array.Empty<string>());
 
-        /// <summary>RCS1259</summary>
-        public static readonly DiagnosticDescriptor AddOrRemoveTrailingComma = DiagnosticDescriptorFactory.Create(
-            id:                 DiagnosticIdentifiers.AddOrRemoveTrailingComma, 
-            title:              "Add/remove trailing comma.", 
-            messageFormat:      "{0} trailing comma.", 
-            category:           DiagnosticCategories.Roslynator, 
-            defaultSeverity:    DiagnosticSeverity.Info, 
-            isEnabledByDefault: false, 
-            description:        null, 
-            helpLinkUri:        DiagnosticIdentifiers.AddOrRemoveTrailingComma, 
-            customTags:         Array.Empty<string>());
-
     }
 }