Merge pull request swiftlang#195 from dabelknap/assorted-fixes

Fix '(set)' keyword, trailing array comments, and verbatim indentation

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -1053,7 +1053,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: DeclModifierSyntax) {
-    after(node.name, tokens: .break)
+    after(node.lastToken, tokens: .break)
     super.visit(node)
   }
 
@@ -1531,7 +1531,7 @@ private final class TokenStreamCreator: SyntaxVisitor {
     appendToken(.break(size: 2, offset: 0))
     appendToken(.comment(commentToken, wasEndOfLine: true))
 
-    if nextToken != nil, ["}", ")"].contains(nextToken?.withoutTrivia().text), trivia.numberOfComments == 1 {
+    if nextToken != nil, ["}", ")", "]"].contains(nextToken?.withoutTrivia().text), trivia.numberOfComments == 1 {
       appendToken(.break(size: maxlinelength, offset: -2))
     } else {
       appendToken(.break(size: maxlinelength))

Sources/SwiftFormatPrettyPrint/Verbatim.swift

@@ -28,21 +28,23 @@ struct Verbatim {
       lines.remove(at: 0)
     }
 
-    guard lines.count > 0 else { return }
+    guard lines.count > 0, let index = lines.firstIndex(where: { $0 != "" }) else { return }
 
     // Get the number of leading whitespaces of the first line, and subract this from the number of
     // leading whitespaces for subsequent lines (if possible). Record the new leading whitespaces
     // counts, and trim off whitespace from the ends of the strings.
-    let count = countLeadingWhitespaces(text: lines[0])
+    let count = countLeadingWhitespaces(text: lines[index])
     leadingWhitespaceCounts = lines.map { max(countLeadingWhitespaces(text: $0) - count, 0) }
     lines = lines.map { $0.trimmingCharacters(in: CharacterSet(charactersIn: " ")) }
   }
 
   func print(indent: Int) -> String {
     var output = ""
     for i in 0..<lines.count {
-      output += String(repeating: " ", count: indent + leadingWhitespaceCounts[i])
-      output += lines[i]
+      if lines[i] != "" {
+        output += String(repeating: " ", count: indent + leadingWhitespaceCounts[i])
+        output += lines[i]
+      }
       if i < lines.count - 1 {
         output += "\n"
       }

Tests/SwiftFormatPrettyPrintTests/AccessorTests.swift

@@ -144,4 +144,17 @@ public class AccessorTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
   }
+
+  public func testSetModifier() {
+    let input =
+      """
+      fileprivate(set) var somevar = 0
+      struct MyStruct {
+        private(set) var myvar = 0
+        internal(set) var anothervar = 0
+      }
+      """
+
+    assertPrettyPrintEqual(input: input, expected: input + "\n", linelength: 50)
+  }
 }

Tests/SwiftFormatPrettyPrintTests/CommentTests.swift

@@ -199,6 +199,10 @@ public class CommentTests: PrettyPrintTestCase {
       let b = ["abc": 456, // small comment
         "def": 789]
 
+      // Trailing comment
+      let c = [123, 456  // small comment
+      ]
+
       /* Array comment */
       let a = [456, /* small comment */
         789]
@@ -222,6 +226,12 @@ public class CommentTests: PrettyPrintTestCase {
         "def": 789
       ]
 
+      // Trailing comment
+      let c = [
+        123,
+        456  // small comment
+      ]
+
       /* Array comment */
       let a = [
         456,  /* small comment */

Tests/SwiftFormatPrettyPrintTests/UnknownStmtTests.swift

@@ -44,6 +44,15 @@ public class UnknownStmtTests: PrettyPrintTestCase {
         }
       #endif
 
+      func myfun() {
+
+        if #available(OSX 10.12, *) {
+
+          let a = 123
+        } else {
+          // do stuff
+        }
+      }
       """
 
     let expected =
@@ -87,6 +96,16 @@ public class UnknownStmtTests: PrettyPrintTestCase {
         }
       #endif
 
+      func myfun() {
+
+        if #available(OSX 10.12, *) {
+
+          let a = 123
+        } else {
+          // do stuff
+        }
+      }
+
       """
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)