Linebreak is no longer inserted at end of fragment

nicklockwood · Nov 8, 2016 · 0831657 · 0831657
1 parent 8519b96
commit 0831657
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/SwiftFormat/Rules.swift b/SwiftFormat/Rules.swift
@@ -701,6 +701,7 @@ public func blankLinesBetweenScopes(_ formatter: Formatter) {
 /// Always end file with a linebreak, to avoid incompatibility with certain unix tools:
 /// http://stackoverflow.com/questions/2287967/why-is-it-recommended-to-have-empty-line-in-the-end-of-file
 public func linebreakAtEndOfFile(_ formatter: Formatter) {
+    guard !formatter.options.fragment else { return }
     if let lastToken = formatter.previousToken(fromIndex: formatter.tokens.count, matching: {
         !$0.isWhitespace && !$0.isError }), !lastToken.isLinebreak {
         formatter.insertToken(.linebreak(formatter.options.linebreak), atIndex: formatter.tokens.count)

diff --git a/SwiftFormatTests/RulesTests.swift b/SwiftFormatTests/RulesTests.swift
@@ -1182,6 +1182,14 @@ class RulesTests: XCTestCase {
         XCTAssertEqual(try! format(input, rules: defaultRules), output)
     }
 
+    func testNoLinebreakAtEndOfFragment() {
+        let input = "foo\nbar"
+        let output = "foo\nbar"
+        let options = FormatOptions(fragment: true)
+        XCTAssertEqual(try! format(input, rules: [linebreakAtEndOfFile], options: options), output)
+        XCTAssertEqual(try! format(input + "\n", rules: defaultRules, options: options), output + "\n")
+    }
+
     // MARK: indent parens
 
     func testSimpleScope() {