Merge pull request swiftlang#166 from dabelknap/deinit

Add support for deinitializers

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -836,6 +836,24 @@ private final class TokenStreamCreator: SyntaxVisitor {
     super.visit(node)
   }
 
+  override func visit(_ node: DeinitializerDeclSyntax) {
+    before(node.firstToken, tokens: .open(.inconsistent, 0))
+
+    if let attributes = node.attributes {
+      before(node.firstToken, tokens: .space(size: 0), .open(.consistent, 0))
+      after(attributes.lastToken, tokens: .open)
+    } else {
+      before(node.firstToken, tokens: .space(size: 0), .open(.consistent, 0), .open)
+    }
+
+    before(node.body.leftBrace, tokens: .break)
+    after(node.body.leftBrace, tokens: .close, .close, .break(offset: 2), .open(.consistent, 0))
+    before(node.body.rightBrace, tokens: .break(offset: -2), .close)
+
+    after(node.lastToken, tokens: .close)
+    super.visit(node)
+  }
+
   override func visit(_ node: SubscriptDeclSyntax) {
     before(node.firstToken, tokens: .open(.inconsistent, 0))
 
@@ -1121,10 +1139,6 @@ private final class TokenStreamCreator: SyntaxVisitor {
     super.visit(node)
   }
 
-  override func visit(_ node: DeinitializerDeclSyntax) {
-    super.visit(node)
-  }
-
   override func visit(_ node: ExpressionPatternSyntax) {
     super.visit(node)
   }

Tests/SwiftFormatPrettyPrintTests/DeinitializerDeclTests.swift

@@ -0,0 +1,79 @@
+public class DeinitializerDeclTests: PrettyPrintTestCase {
+  public func testBasicDeinitializerDeclarations() {
+    let input =
+      """
+      struct Struct {
+        deinit {
+            print("Hello World")
+            let a = 23
+        }
+        deinit {
+            let a = 23
+        }
+        deinit { let a = "AAAA BBBB CCCC DDDD EEEE FFFF" }
+      }
+      """
+
+    let expected =
+      """
+      struct Struct {
+        deinit {
+          print("Hello World")
+          let a = 23
+        }
+        deinit { let a = 23 }
+        deinit {
+          let a = "AAAA BBBB CCCC DDDD EEEE FFFF"
+        }
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 50)
+  }
+
+  public func testDeinitializerAttributes() {
+    let input =
+      """
+      struct Struct {
+        @objc deinit {
+          let a = 123
+          let b = "abc"
+        }
+        @objc @inlinable deinit {
+          let a = 123
+          let b = "abc"
+        }
+        @objc @available(swift 4.0) deinit {
+          let a = 123
+          let b = "abc"
+        }
+      }
+      """
+
+    let expected =
+      """
+      struct Struct {
+        @objc deinit {
+          let a = 123
+          let b = "abc"
+        }
+        @objc
+        @inlinable
+        deinit {
+          let a = 123
+          let b = "abc"
+        }
+        @objc
+        @available(swift 4.0)
+        deinit {
+          let a = 123
+          let b = "abc"
+        }
+      }
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 25)
+  }
+}