Rename analyzers RCS0030, RCS0033 (#1314)

josefpihrt · web-flow · commit 4f816f1a54be · 2023-12-02T19:01:27.000+01:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Group code fix "Change accessibility to ..." ([PR](https://github.com/dotnet/roslynator/pull/1305))
 - [CLI] Bump Roslyn to 4.8.0 ([PR](https://github.com/dotnet/roslynator/pull/1307)).
 - Group refactoring "Remove members above/below'" ([PR](https://github.com/dotnet/roslynator/pull/1308))
+- Rename analyzers ([PR](https://github.com/dotnet/roslynator/pull/1314))
+  - "Add new line before embedded statement" -> "Put embedded statement on its own line" ([RCS0030](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0030))
+  - "Add new line before statement" -> "Put statement on its own line" ([RCS0033](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0033))
 
 ### Fixed
 
diff --git a/src/Analyzers.xml b/src/Analyzers.xml
@@ -782,8 +782,8 @@ namespace N
   </Analyzer>
   <Analyzer>
     <Id>RCS0030</Id>
-    <Identifier>AddNewLineBeforeEmbeddedStatement</Identifier>
-    <Title>Add new line before embedded statement</Title>
+    <Identifier>PutEmbeddedStatementOnItsOwnLine</Identifier>
+    <Title>Put embedded statement on its own line</Title>
     <DefaultSeverity>Info</DefaultSeverity>
     <IsEnabledByDefault>false</IsEnabledByDefault>
     <Samples>
@@ -850,8 +850,8 @@ namespace N
   </Analyzer>
   <Analyzer>
     <Id>RCS0033</Id>
-    <Identifier>AddNewLineBeforeStatement</Identifier>
-    <Title>Add new line before statement</Title>
+    <Identifier>PutStatementOnItsOwnLine</Identifier>
+    <Title>Put statement on its own line</Title>
     <DefaultSeverity>Info</DefaultSeverity>
     <IsEnabledByDefault>false</IsEnabledByDefault>
     <Samples>
diff --git a/src/Formatting.Analyzers.CodeFixes/CSharp/StatementCodeFixProvider.cs b/src/Formatting.Analyzers.CodeFixes/CSharp/StatementCodeFixProvider.cs
@@ -23,8 +23,8 @@ public override ImmutableArray<string> FixableDiagnosticIds
         get
         {
             return ImmutableArray.Create(
-                DiagnosticIdentifiers.AddNewLineBeforeStatement,
-                DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement,
+                DiagnosticIdentifiers.PutStatementOnItsOwnLine,
+                DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine,
                 DiagnosticIdentifiers.AddNewLineAfterSwitchLabel,
                 DiagnosticIdentifiers.AddBlankLineAfterEmbeddedStatement);
         }
@@ -42,8 +42,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
         switch (diagnostic.Id)
         {
-            case DiagnosticIdentifiers.AddNewLineBeforeStatement:
-            case DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement:
+            case DiagnosticIdentifiers.PutStatementOnItsOwnLine:
+            case DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine:
             case DiagnosticIdentifiers.AddNewLineAfterSwitchLabel:
                 {
                     CodeAction codeAction = CodeAction.Create(
diff --git a/src/Formatting.Analyzers/CSharp/DiagnosticIdentifiers.Generated.cs b/src/Formatting.Analyzers/CSharp/DiagnosticIdentifiers.Generated.cs
@@ -32,10 +32,10 @@ public static partial class DiagnosticIdentifiers
         public const string PlaceNewLineAfterOrBeforeBinaryOperator = "RCS0027";
         public const string PlaceNewLineAfterOrBeforeConditionalOperator = "RCS0028";
         public const string PutConstructorInitializerOnItsOwnLine = "RCS0029";
-        public const string AddNewLineBeforeEmbeddedStatement = "RCS0030";
+        public const string PutEmbeddedStatementOnItsOwnLine = "RCS0030";
         public const string PutEnumMemberOnItsOwnLine = "RCS0031";
         public const string PlaceNewLineAfterOrBeforeArrowToken = "RCS0032";
-        public const string AddNewLineBeforeStatement = "RCS0033";
+        public const string PutStatementOnItsOwnLine = "RCS0033";
         public const string PutTypeParameterConstraintOnItsOwnLine = "RCS0034";
         public const string RemoveBlankLineBetweenSingleLineDeclarationsOfSameKind = "RCS0036";
         public const string RemoveBlankLineBetweenUsingDirectivesWithSameRootNamespace = "RCS0038";
diff --git a/src/Formatting.Analyzers/CSharp/DiagnosticRules.Generated.cs b/src/Formatting.Analyzers/CSharp/DiagnosticRules.Generated.cs
@@ -298,15 +298,15 @@ public static partial class DiagnosticRules
             customTags:         Array.Empty<string>());
 
         /// <summary>RCS0030</summary>
-        public static readonly DiagnosticDescriptor AddNewLineBeforeEmbeddedStatement = DiagnosticDescriptorFactory.Create(
-            id:                 DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement, 
-            title:              "Add new line before embedded statement", 
-            messageFormat:      "Add new line before embedded statement", 
+        public static readonly DiagnosticDescriptor PutEmbeddedStatementOnItsOwnLine = DiagnosticDescriptorFactory.Create(
+            id:                 DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine, 
+            title:              "Put embedded statement on its own line", 
+            messageFormat:      "Put embedded statement on its own line", 
             category:           DiagnosticCategories.Roslynator, 
             defaultSeverity:    DiagnosticSeverity.Info, 
             isEnabledByDefault: false, 
             description:        null, 
-            helpLinkUri:        DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement, 
+            helpLinkUri:        DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine, 
             customTags:         Array.Empty<string>());
 
         /// <summary>RCS0031</summary>
@@ -334,15 +334,15 @@ public static partial class DiagnosticRules
             customTags:         Array.Empty<string>());
 
         /// <summary>RCS0033</summary>
-        public static readonly DiagnosticDescriptor AddNewLineBeforeStatement = DiagnosticDescriptorFactory.Create(
-            id:                 DiagnosticIdentifiers.AddNewLineBeforeStatement, 
-            title:              "Add new line before statement", 
-            messageFormat:      "Add new line before statement", 
+        public static readonly DiagnosticDescriptor PutStatementOnItsOwnLine = DiagnosticDescriptorFactory.Create(
+            id:                 DiagnosticIdentifiers.PutStatementOnItsOwnLine, 
+            title:              "Put statement on its own line", 
+            messageFormat:      "Put statement on its own line", 
             category:           DiagnosticCategories.Roslynator, 
             defaultSeverity:    DiagnosticSeverity.Info, 
             isEnabledByDefault: false, 
             description:        null, 
-            helpLinkUri:        DiagnosticIdentifiers.AddNewLineBeforeStatement, 
+            helpLinkUri:        DiagnosticIdentifiers.PutStatementOnItsOwnLine, 
             customTags:         Array.Empty<string>());
 
         /// <summary>RCS0034</summary>
diff --git a/src/Formatting.Analyzers/CSharp/PutEmbeddedStatementOnItsOwnLineAnalyzer.cs b/src/Formatting.Analyzers/CSharp/PutEmbeddedStatementOnItsOwnLineAnalyzer.cs
@@ -11,7 +11,7 @@
 namespace Roslynator.Formatting.CSharp;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class AddNewLineBeforeEmbeddedStatementAnalyzer : BaseDiagnosticAnalyzer
+public sealed class PutEmbeddedStatementOnItsOwnLineAnalyzer : BaseDiagnosticAnalyzer
 {
     private static ImmutableArray<DiagnosticDescriptor> _supportedDiagnostics;
 
@@ -20,7 +20,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
         get
         {
             if (_supportedDiagnostics.IsDefault)
-                Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.AddNewLineBeforeEmbeddedStatement);
+                Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.PutEmbeddedStatementOnItsOwnLine);
 
             return _supportedDiagnostics;
         }
@@ -125,7 +125,7 @@ private static void ReportDiagnostic(SyntaxNodeAnalysisContext context, Statemen
     {
         DiagnosticHelpers.ReportDiagnostic(
             context,
-            DiagnosticRules.AddNewLineBeforeEmbeddedStatement,
+            DiagnosticRules.PutEmbeddedStatementOnItsOwnLine,
             Location.Create(statement.SyntaxTree, statement.Span.WithLength(0)));
     }
 }
diff --git a/src/Formatting.Analyzers/CSharp/PutStatementOnItsOwnLineAnalyzer.cs b/src/Formatting.Analyzers/CSharp/PutStatementOnItsOwnLineAnalyzer.cs
@@ -10,7 +10,7 @@
 namespace Roslynator.Formatting.CSharp;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class AddNewLineBeforeStatementAnalyzer : BaseDiagnosticAnalyzer
+public sealed class PutStatementOnItsOwnLineAnalyzer : BaseDiagnosticAnalyzer
 {
     private static ImmutableArray<DiagnosticDescriptor> _supportedDiagnostics;
 
@@ -19,7 +19,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
         get
         {
             if (_supportedDiagnostics.IsDefault)
-                Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.AddNewLineBeforeStatement);
+                Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.PutStatementOnItsOwnLine);
 
             return _supportedDiagnostics;
         }
@@ -63,7 +63,7 @@ private static void Analyze(SyntaxNodeAnalysisContext context, SyntaxList<Statem
             {
                 DiagnosticHelpers.ReportDiagnostic(
                     context,
-                    DiagnosticRules.AddNewLineBeforeStatement,
+                    DiagnosticRules.PutStatementOnItsOwnLine,
                     Location.Create(statement.SyntaxTree, statement.Span.WithLength(0)));
             }
 
diff --git a/src/Tests/Formatting.Analyzers.Tests/RCS0030PutEmbeddedStatementOnItsOwnLineTests.cs b/src/Tests/Formatting.Analyzers.Tests/RCS0030PutEmbeddedStatementOnItsOwnLineTests.cs
@@ -8,11 +8,11 @@
 
 namespace Roslynator.Formatting.CSharp.Tests;
 
-public class RCS0030AddNewLineBeforeEmbeddedStatementTests : AbstractCSharpDiagnosticVerifier<AddNewLineBeforeEmbeddedStatementAnalyzer, StatementCodeFixProvider>
+public class RCS0030PutEmbeddedStatementOnItsOwnLineTests : AbstractCSharpDiagnosticVerifier<PutEmbeddedStatementOnItsOwnLineAnalyzer, StatementCodeFixProvider>
 {
-    public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.AddNewLineBeforeEmbeddedStatement;
+    public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.PutEmbeddedStatementOnItsOwnLine;
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_If()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -39,7 +39,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_Else()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -70,7 +70,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_ForEach()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -103,7 +103,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_ForEachVariable()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -136,7 +136,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_For()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -169,7 +169,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_Using()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -200,7 +200,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_While()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -227,7 +227,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_Do()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -256,7 +256,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_Lock()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -283,7 +283,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task Test_Fixed()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -316,7 +316,7 @@ void M()
 ", options: Options.WithAllowUnsafe(true));
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task TestNoDiagnostic_EmbeddedStatement()
     {
         await VerifyNoDiagnosticAsync(@"
@@ -367,7 +367,7 @@ private static void M()
 ", options: Options.WithAllowUnsafe(true));
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]
     public async Task TestNoDiagnostic_Block()
     {
         await VerifyNoDiagnosticAsync(@"
diff --git a/src/Tests/Formatting.Analyzers.Tests/RCS0033PutStatementOnItsOwnLineTests.cs b/src/Tests/Formatting.Analyzers.Tests/RCS0033PutStatementOnItsOwnLineTests.cs
@@ -8,11 +8,11 @@
 
 namespace Roslynator.Formatting.CSharp.Tests;
 
-public class RCS0033AddNewLineBeforeStatementTests : AbstractCSharpDiagnosticVerifier<AddNewLineBeforeStatementAnalyzer, StatementCodeFixProvider>
+public class RCS0033PutStatementOnItsOwnLineTests : AbstractCSharpDiagnosticVerifier<PutStatementOnItsOwnLineAnalyzer, StatementCodeFixProvider>
 {
-    public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.AddNewLineBeforeStatement;
+    public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.PutStatementOnItsOwnLine;
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutStatementOnItsOwnLine)]
     public async Task Test_Block()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -35,7 +35,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutStatementOnItsOwnLine)]
     public async Task Test_Block_SingleLine()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -55,7 +55,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutStatementOnItsOwnLine)]
     public async Task Test_SwitchSection()
     {
         await VerifyDiagnosticAndFixAsync(@"
@@ -90,7 +90,7 @@ void M()
 ");
     }
 
-    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeStatement)]
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutStatementOnItsOwnLine)]
     public async Task TestNoDiagnostic_EmptyStatement()
     {
         await VerifyNoDiagnosticAsync(@"
diff --git a/src/VisualStudioCode/package/src/configurationFiles.generated.ts b/src/VisualStudioCode/package/src/configurationFiles.generated.ts
@@ -218,7 +218,7 @@ roslynator_analyzers.enabled_by_default = true|false
 # Put constructor initializer on its own line
 #dotnet_diagnostic.rcs0029.severity = none
 
-# Add new line before embedded statement
+# Put embedded statement on its own line
 #dotnet_diagnostic.rcs0030.severity = none
 
 # Put enum member on its own line
@@ -228,7 +228,7 @@ roslynator_analyzers.enabled_by_default = true|false
 #dotnet_diagnostic.rcs0032.severity = none
 # Options: roslynator_arrow_token_new_line
 
-# Add new line before statement
+# Put statement on its own line
 #dotnet_diagnostic.rcs0033.severity = none
 
 # Put type parameter constraint on its own line

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public override ImmutableArray<string> FixableDiagnosticIds`
`23`	`23`	`get`
`24`	`24`	`{`
`25`	`25`	`return ImmutableArray.Create(`
`26`		`- DiagnosticIdentifiers.AddNewLineBeforeStatement,`
`27`		`- DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement,`
	`26`	`+ DiagnosticIdentifiers.PutStatementOnItsOwnLine,`
	`27`	`+ DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine,`
`28`	`28`	`DiagnosticIdentifiers.AddNewLineAfterSwitchLabel,`
`29`	`29`	`DiagnosticIdentifiers.AddBlankLineAfterEmbeddedStatement);`
`30`	`30`	`}`
`@@ -42,8 +42,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)`
`42`	`42`
`43`	`43`	`switch (diagnostic.Id)`
`44`	`44`	`{`
`45`		`- case DiagnosticIdentifiers.AddNewLineBeforeStatement:`
`46`		`- case DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement:`
	`45`	`+ case DiagnosticIdentifiers.PutStatementOnItsOwnLine:`
	`46`	`+ case DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine:`
`47`	`47`	`case DiagnosticIdentifiers.AddNewLineAfterSwitchLabel:`
`48`	`48`	`{`
`49`	`49`	`CodeAction codeAction = CodeAction.Create(`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`namespace Roslynator.Formatting.CSharp;`
`12`	`12`
`13`	`13`	`[DiagnosticAnalyzer(LanguageNames.CSharp)]`
`14`		`-public sealed class AddNewLineBeforeEmbeddedStatementAnalyzer : BaseDiagnosticAnalyzer`
	`14`	`+public sealed class PutEmbeddedStatementOnItsOwnLineAnalyzer : BaseDiagnosticAnalyzer`
`15`	`15`	`{`
`16`	`16`	`private static ImmutableArray<DiagnosticDescriptor> _supportedDiagnostics;`
`17`	`17`
`@@ -20,7 +20,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics`
`20`	`20`	`get`
`21`	`21`	`{`
`22`	`22`	`if (_supportedDiagnostics.IsDefault)`
`23`		`- Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.AddNewLineBeforeEmbeddedStatement);`
	`23`	`+ Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.PutEmbeddedStatementOnItsOwnLine);`
`24`	`24`
`25`	`25`	`return _supportedDiagnostics;`
`26`	`26`	`}`
`@@ -125,7 +125,7 @@ private static void ReportDiagnostic(SyntaxNodeAnalysisContext context, Statemen`
`125`	`125`	`{`
`126`	`126`	`DiagnosticHelpers.ReportDiagnostic(`
`127`	`127`	`context,`
`128`		`- DiagnosticRules.AddNewLineBeforeEmbeddedStatement,`
	`128`	`+ DiagnosticRules.PutEmbeddedStatementOnItsOwnLine,`
`129`	`129`	`Location.Create(statement.SyntaxTree, statement.Span.WithLength(0)));`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace Roslynator.Formatting.CSharp;`
`11`	`11`
`12`	`12`	`[DiagnosticAnalyzer(LanguageNames.CSharp)]`
`13`		`-public sealed class AddNewLineBeforeStatementAnalyzer : BaseDiagnosticAnalyzer`
	`13`	`+public sealed class PutStatementOnItsOwnLineAnalyzer : BaseDiagnosticAnalyzer`
`14`	`14`	`{`
`15`	`15`	`private static ImmutableArray<DiagnosticDescriptor> _supportedDiagnostics;`
`16`	`16`
`@@ -19,7 +19,7 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics`
`19`	`19`	`get`
`20`	`20`	`{`
`21`	`21`	`if (_supportedDiagnostics.IsDefault)`
`22`		`- Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.AddNewLineBeforeStatement);`
	`22`	`+ Immutable.InterlockedInitialize(ref _supportedDiagnostics, DiagnosticRules.PutStatementOnItsOwnLine);`
`23`	`23`
`24`	`24`	`return _supportedDiagnostics;`
`25`	`25`	`}`
`@@ -63,7 +63,7 @@ private static void Analyze(SyntaxNodeAnalysisContext context, SyntaxList<Statem`
`63`	`63`	`{`
`64`	`64`	`DiagnosticHelpers.ReportDiagnostic(`
`65`	`65`	`context,`
`66`		`- DiagnosticRules.AddNewLineBeforeStatement,`
	`66`	`+ DiagnosticRules.PutStatementOnItsOwnLine,`
`67`	`67`	`Location.Create(statement.SyntaxTree, statement.Span.WithLength(0)));`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`
`9`	`9`	`namespace Roslynator.Formatting.CSharp.Tests;`
`10`	`10`
`11`		`-public class RCS0030AddNewLineBeforeEmbeddedStatementTests : AbstractCSharpDiagnosticVerifier<AddNewLineBeforeEmbeddedStatementAnalyzer, StatementCodeFixProvider>`
	`11`	`+public class RCS0030PutEmbeddedStatementOnItsOwnLineTests : AbstractCSharpDiagnosticVerifier<PutEmbeddedStatementOnItsOwnLineAnalyzer, StatementCodeFixProvider>`
`12`	`12`	`{`
`13`		`- public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.AddNewLineBeforeEmbeddedStatement;`
	`13`	`+ public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.PutEmbeddedStatementOnItsOwnLine;`
`14`	`14`
`15`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`15`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`16`	`16`	`public async Task Test_If()`
`17`	`17`	`{`
`18`	`18`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -39,7 +39,7 @@ void M()`
`39`	`39`	`");`
`40`	`40`	`}`
`41`	`41`
`42`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`42`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`43`	`43`	`public async Task Test_Else()`
`44`	`44`	`{`
`45`	`45`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -70,7 +70,7 @@ void M()`
`70`	`70`	`");`
`71`	`71`	`}`
`72`	`72`
`73`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`73`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`74`	`74`	`public async Task Test_ForEach()`
`75`	`75`	`{`
`76`	`76`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -103,7 +103,7 @@ void M()`
`103`	`103`	`");`
`104`	`104`	`}`
`105`	`105`
`106`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`106`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`107`	`107`	`public async Task Test_ForEachVariable()`
`108`	`108`	`{`
`109`	`109`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -136,7 +136,7 @@ void M()`
`136`	`136`	`");`
`137`	`137`	`}`
`138`	`138`
`139`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`139`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`140`	`140`	`public async Task Test_For()`
`141`	`141`	`{`
`142`	`142`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -169,7 +169,7 @@ void M()`
`169`	`169`	`");`
`170`	`170`	`}`
`171`	`171`
`172`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`172`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`173`	`173`	`public async Task Test_Using()`
`174`	`174`	`{`
`175`	`175`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -200,7 +200,7 @@ void M()`
`200`	`200`	`");`
`201`	`201`	`}`
`202`	`202`
`203`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`203`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`204`	`204`	`public async Task Test_While()`
`205`	`205`	`{`
`206`	`206`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -227,7 +227,7 @@ void M()`
`227`	`227`	`");`
`228`	`228`	`}`
`229`	`229`
`230`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`230`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`231`	`231`	`public async Task Test_Do()`
`232`	`232`	`{`
`233`	`233`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -256,7 +256,7 @@ void M()`
`256`	`256`	`");`
`257`	`257`	`}`
`258`	`258`
`259`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`259`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`260`	`260`	`public async Task Test_Lock()`
`261`	`261`	`{`
`262`	`262`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -283,7 +283,7 @@ void M()`
`283`	`283`	`");`
`284`	`284`	`}`
`285`	`285`
`286`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`286`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`287`	`287`	`public async Task Test_Fixed()`
`288`	`288`	`{`
`289`	`289`	`await VerifyDiagnosticAndFixAsync(@"`
`@@ -316,7 +316,7 @@ void M()`
`316`	`316`	`", options: Options.WithAllowUnsafe(true));`
`317`	`317`	`}`
`318`	`318`
`319`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`319`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`320`	`320`	`public async Task TestNoDiagnostic_EmbeddedStatement()`
`321`	`321`	`{`
`322`	`322`	`await VerifyNoDiagnosticAsync(@"`
`@@ -367,7 +367,7 @@ private static void M()`
`367`	`367`	`", options: Options.WithAllowUnsafe(true));`
`368`	`368`	`}`
`369`	`369`
`370`		`- [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddNewLineBeforeEmbeddedStatement)]`
	`370`	`+ [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.PutEmbeddedStatementOnItsOwnLine)]`
`371`	`371`	`public async Task TestNoDiagnostic_Block()`
`372`	`372`	`{`
`373`	`373`	`await VerifyNoDiagnosticAsync(@"`