Merge pull request #279 from cbjeukendrup/UseSingleLinePropertyGetter…

…_not_with_async_throws UseSingleLinePropertyGetter: respect `async` and `throws` on getters
swiftlang · Mar 18, 2022 · 55fc4e2 · 55fc4e2
1 parent f646a1f
commit 55fc4e2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/Sources/SwiftFormatRules/UseSingleLinePropertyGetter.swift b/Sources/SwiftFormatRules/UseSingleLinePropertyGetter.swift
@@ -28,7 +28,9 @@ public final class UseSingleLinePropertyGetter: SyntaxFormatRule {
       accessorBlock.accessors.count == 1,
       acc.accessorKind.tokenKind == .contextualKeyword("get"),
       acc.attributes == nil,
-      acc.modifier == nil
+      acc.modifier == nil,
+      acc.asyncKeyword == nil,
+      acc.throwsKeyword == nil
     else { return Syntax(node) }
 
     diagnose(.removeExtraneousGetBlock, on: acc)

diff --git a/Tests/SwiftFormatRulesTests/UseSingleLinePropertyGetterTests.swift b/Tests/SwiftFormatRulesTests/UseSingleLinePropertyGetterTests.swift
@@ -18,6 +18,21 @@ final class UseSingleLinePropertyGetterTests: LintOrFormatRuleTestCase {
              var j: Int {
                mutating get { return 0 }
              }
+             var k: Int {
+               get async {
+                 return 4
+               }
+             }
+             var l: Int {
+               get throws {
+                 return 4
+               }
+             }
+             var m: Int {
+               get async throws {
+                 return 4
+               }
+             }
              """,
       expected: """
                 var g: Int { return 4 }
@@ -31,6 +46,21 @@ final class UseSingleLinePropertyGetterTests: LintOrFormatRuleTestCase {
                 var j: Int {
                   mutating get { return 0 }
                 }
+                var k: Int {
+                  get async {
+                    return 4
+                  }
+                }
+                var l: Int {
+                  get throws {
+                    return 4
+                  }
+                }
+                var m: Int {
+                  get async throws {
+                    return 4
+                  }
+                }
                 """)
   }
 }