Merge pull request #22192 from MaStr11/PreserveAttributesOnSingleLine

Keep attribute on the same line as a member if they started on a single line

src/Workspaces/CSharp/Portable/Formatting/Rules/SuppressFormattingRule.cs

@@ -62,22 +62,23 @@ private void AddSpecificNodesSuppressOperations(List<SuppressOperation> list, Sy
 
             if (node is MemberDeclarationSyntax memberDeclNode)
             {
-                // Attempt to keep the part of a member that follows hte attributes on a single
+                // Attempt to keep the part of a member that follows the attributes on a single
                 // line if that's how it's currently written.
                 var tokens = memberDeclNode.GetFirstAndLastMemberDeclarationTokensAfterAttributes();
                 AddSuppressWrappingIfOnSingleLineOperation(list, tokens.Item1, tokens.Item2);
 
+                // Also, If the member is on single line with its attributes on it, then keep 
+                // it on a single line.  This is for code like the following:
+                //
+                //      [Import] public int Field1;
+                //      [Import] public int Field2;
                 var attributes = memberDeclNode.GetAttributes();
-                if (attributes.Count > 0)
+                var endToken = node.GetLastToken(includeZeroWidth: true);
+                for (var i = 0; i < attributes.Count; ++i)
                 {
-                    // Also, If the member is on single line with its attributes on it, then keep 
-                    // it on a single line.  This is for code like the following:
-                    //
-                    //      [Import] public int Field1;
-                    //      [Import] public int Field2;
                     AddSuppressWrappingIfOnSingleLineOperation(list,
-                        node.GetFirstToken(includeZeroWidth: true),
-                        node.GetLastToken(includeZeroWidth: true));
+                        attributes[i].GetFirstToken(includeZeroWidth: true),
+                        endToken);
                 }
 
                 var propertyDeclNode = node as PropertyDeclarationSyntax;

src/Workspaces/CSharpTest/Formatting/FormattingTests.cs

@@ -7946,6 +7946,64 @@ class C {
 }");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.Formatting)]
+        [WorkItem(21789, "https://github.com/dotnet/roslyn/issues/21789")]
+        public async Task FormatMultipleAttributeOnSameLineAsField1()
+        {
+            await AssertFormatAsync(
+@"
+class C
+{
+    [Attr1]
+    [Attr2]
+    [Attr3] [Attr4] int i;
+}",
+@"
+class C {
+    [Attr1]
+    [Attr2]
+    [Attr3][Attr4]   int   i;
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.Formatting)]
+        [WorkItem(21789, "https://github.com/dotnet/roslyn/issues/21789")]
+        public async Task FormatMultipleAttributesOnSameLineAsField2()
+        {
+            await AssertFormatAsync(
+@"
+class C
+{
+    [Attr1]
+    [Attr2]
+    [Attr3] [Attr4] int i;
+}",
+@"
+class C {
+    [Attr1][Attr2]
+    [Attr3][Attr4]   int   i;
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.Formatting)]
+        [WorkItem(21789, "https://github.com/dotnet/roslyn/issues/21789")]
+        public async Task FormatMultipleAttributeOnSameLineAndFieldOnNewLine()
+        {
+            await AssertFormatAsync(
+@"
+class C
+{
+    [Attr1]
+    [Attr2]
+    int i;
+}",
+@"
+class C {
+    [Attr1][Attr2]
+    int   i;
+}");
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.Formatting)]
         [WorkItem(6628, "https://github.com/dotnet/roslyn/issues/6628")]
         public async Task FormatOnElseBlockBracesOnSameLineRemainsInSameLine_2()