Merge pull request swiftlang#193 from dabelknap/mutating-accessors

Don't remove 'get' statements with modifiers or attributes

Author: allevato

Sources/SwiftFormatRules/UseSingleLinePropertyGetter.swift

@@ -29,7 +29,9 @@ public final class UseSingleLinePropertyGetter: SyntaxFormatRule {
       let acc = accessorList.first,
       let body = acc.body,
       accessorList.count == 1,
-      acc.accessorKind.tokenKind == .contextualKeyword("get")
+      acc.accessorKind.tokenKind == .contextualKeyword("get"),
+      acc.attributes == nil,
+      acc.modifier == nil
     else { return node }
 
     diagnose(.removeExtraneousGetBlock, on: acc)

Tests/SwiftFormatRulesTests/UseSingleLinePropertyGetterTests.swift

@@ -19,6 +19,9 @@ public class UseSingleLinePropertyGetterTests: DiagnosingTestCase {
                get { return 0 }
                set { print("no set, only get") }
              }
+             var j: Int {
+               mutating get { return 0 }
+             }
              """,
       expected: """
                 var g: Int { return 4 }
@@ -29,6 +32,9 @@ public class UseSingleLinePropertyGetterTests: DiagnosingTestCase {
                   get { return 0 }
                   set { print("no set, only get") }
                 }
+                var j: Int {
+                  mutating get { return 0 }
+                }
                 """)
   }