Fixed bug in Void handling

nicklockwood · Nov 3, 2016 · fba8f28 · fba8f28
1 parent 9f3604b
commit fba8f28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/SwiftFormat/Rules.swift b/SwiftFormat/Rules.swift
@@ -1329,7 +1329,8 @@ public func void(_ formatter: Formatter) {
             formatter.tokenAtIndex(prevIndex) == .startOfScope("("),
             let nextIndex = formatter.indexOfNextToken(fromIndex: i, matching: { !$0.isWhitespaceOrLinebreak }),
             formatter.tokenAtIndex(nextIndex) == .endOfScope(")") {
-            if formatter.nextNonWhitespaceOrCommentOrLinebreakToken(fromIndex: nextIndex) == .symbol("->") {
+            if let nextToken = formatter.nextNonWhitespaceOrCommentOrLinebreakToken(fromIndex: nextIndex),
+                [.symbol("->"), .keyword("throws"), .keyword("rethrows")].contains(nextToken) {
                 // Remove Void
                 formatter.removeTokensInRange(prevIndex + 1 ..< nextIndex)
             } else if formatter.options.useVoid {

diff --git a/SwiftFormatTests/RulesTests.swift b/SwiftFormatTests/RulesTests.swift
@@ -2255,6 +2255,13 @@ class RulesTests: XCTestCase {
         XCTAssertEqual(try! format(input + "\n", rules: defaultRules), output + "\n")
     }
 
+    func testVoidThrowsIsNotMangled() {
+        let input = "(Void) throws -> Void"
+        let output = "() throws -> Void"
+        XCTAssertEqual(try! format(input, rules: [void]), output)
+        XCTAssertEqual(try! format(input + "\n", rules: defaultRules), output + "\n")
+    }
+
     // MARK: useVoid = false
 
     func testUseVoidOptionFalse() {