Merge pull request swiftlang#186 from dabelknap/verbatim-length

Correct the Verbatim Token Length Calculation

Author: allevato

Sources/SwiftFormatPrettyPrint/PrettyPrint.swift

@@ -355,9 +355,17 @@ public class PrettyPrinter {
         lengths.append(comment.length)
         total += comment.length
 
-      case .verbatim:
-        lengths.append(maxLineLength)
-        total += maxLineLength
+      case .verbatim(let verbatim):
+        var length: Int
+        if verbatim.lines.count > 1 {
+          length = maxLineLength
+        } else if verbatim.lines.count == 0 {
+          length = 0
+        } else {
+          length = verbatim.lines[0].count
+        }
+        lengths.append(length)
+        total += length
       }
     }
 

Tests/SwiftFormatPrettyPrintTests/StringTests.swift

@@ -3,20 +3,22 @@ public class StringTests: PrettyPrintTestCase {
     let input =
       """
       let a = "abc"
+      myFun("Some string \\(a + b)")
       let b = "A really long string that should not wrap"
       let c = "A really long string with \\(a + b) some expressions \\(c + d)"
       """
 
     let expected =
       """
       let a = "abc"
+      myFun("Some string \\(a + b)")
       let b =
         "A really long string that should not wrap"
       let c =
         "A really long string with \\(a + b) some expressions \\(c + d)"
 
       """
 
-    assertPrettyPrintEqual(input: input, expected: expected, linelength: 20)
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 35)
   }
 }