Updated for 0.42.0 release

.swift-version

@@ -1 +0,0 @@
-4.2

.swiftformat

@@ -30,9 +30,10 @@
 --self remove
 --semicolons inline
 --stripunusedargs always
+--swiftversion 4.2
 --trimwhitespace always
---wraparguments preserve
---wrapcollections preserve
+--wraparguments before-first
+--wrapcollections before-first
 
 # rules
 

.travis.yml

@@ -15,8 +15,9 @@ matrix:
         - xcodebuild -project SwiftFormat.xcodeproj -scheme "SwiftFormat (Framework)" -sdk macosx clean build test | bundle exec xcpretty
       after_success: bundle exec slather
     - os: linux
-      language: generic
+      dist: xenial
       sudo: required
-      dist: trusty
+      services: docker
+      env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 SWIFT_TEST_ARGS="--parallel"
       install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script: swift test

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.42.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.42.0) (2019-11-30)
+
+- Added `wrap` rule for automatic wrapping of long statements or expressions based on `--maxwidth` option
+- Fixed bug with `braces` rule inserting a redundant blank line at the start of nested scopes
+
 ## [0.41.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.41.2) (2019-11-27)
 
 - Fixed bug with `trailingCommas` rule incorrectly inserting a comma into wrapped collection type expressions

EditorExtension/Application/Info.plist

@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

EditorExtension/Extension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist

@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources

@@ -6,27 +6,27 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		b56uYtNYF9RUEJEdyt9Xov7oGxM=
+		wAW+8ygQ6vNPY3flmHSOpBpJOU0=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		5ilkAR9037QrXXB0u8rZhd9Y5zk=
+		KekjDtIGuLc4Tia14mfhTy3bSj0=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		dpov5E4WJlRBx2aq7rDbowCnJqw=
+		yhcNGu55eve6R74+TZLA1+6MSSA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		2jjiIcU6V15iG+O89anMlpDvGZk=
+		zWBiXA8MEFqlkhVFNV90egsyIsA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		WUOlNxK6d4ZFWzM6mg4xuZeBQi8=
+		BFG/IrO7AYsOKUp3L3YbXPdoGA8=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		ur/vyB9AzKgbJ8TTRdHpDuOW6cs=
+		IcMYHpqhzqQJ+rQQbEZ5ARQQkyA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
@@ -111,7 +111,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			vHKhH5rQ+aqJiA6KaapV25m0dEo=
+			o6H7/FFzDjpdGADI7kukOes6Xj4=
 			</data>
 			<key>requirement</key>
 			<string>identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
@@ -120,66 +120,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			b56uYtNYF9RUEJEdyt9Xov7oGxM=
+			wAW+8ygQ6vNPY3flmHSOpBpJOU0=
 			</data>
 			<key>hash2</key>
 			<data>
-			eqvX2YPtxDOZgib+3n4l2zZN1990B6leJerISvOHYqM=
+			o+IdPqIA9P9k+/L5q53szVIjn9NqD4DjzPKDGpBttFQ=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			5ilkAR9037QrXXB0u8rZhd9Y5zk=
+			KekjDtIGuLc4Tia14mfhTy3bSj0=
 			</data>
 			<key>hash2</key>
 			<data>
-			1Cslzhy4a0hB+/xkDytHpec1gCfuZ8NsX3b7m4+/WrI=
+			vtNpZEbh8zFW9nmznrdoVgQF8jqD1mJ3LXIgNK7JQRc=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			dpov5E4WJlRBx2aq7rDbowCnJqw=
+			yhcNGu55eve6R74+TZLA1+6MSSA=
 			</data>
 			<key>hash2</key>
 			<data>
-			y639OeNadHCsi/ei9LBMXadi5a0fsF5lJZvl3CMwEUA=
+			+XHyyE2I76pOQT/+QUy5K+b1xcMxapki6+/0NQOPqdw=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			2jjiIcU6V15iG+O89anMlpDvGZk=
+			zWBiXA8MEFqlkhVFNV90egsyIsA=
 			</data>
 			<key>hash2</key>
 			<data>
-			dtr8sC1e8TZ0T+zbjcxaebeNn4zwjV8U1noKwCd0QDk=
+			5iwaiMDdVgUefmIypLrWw3gN7O8aDpM7aKoUuun/vTs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			WUOlNxK6d4ZFWzM6mg4xuZeBQi8=
+			BFG/IrO7AYsOKUp3L3YbXPdoGA8=
 			</data>
 			<key>hash2</key>
 			<data>
-			hJ1NlRR9ZgTvuMBLGFdsyXGxomN3Fg6OJtpHph6MCnc=
+			YlJQmDZL0ceKTECJxt1pzrcjpgcUVLsnsRz/xe+5Fr0=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ur/vyB9AzKgbJ8TTRdHpDuOW6cs=
+			IcMYHpqhzqQJ+rQQbEZ5ARQQkyA=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZBqAO9t9+e9mD/Jr3E7pIT91LX3xOlxkkbZ2LvsY0g4=
+			oWv4KpRvt6nTWO+9r7DsezT5zqbGmxRbmA1JANWb+xw=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

Sources/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.41.2
+//  Version 0.42.0
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/SwiftFormat.swift

@@ -32,7 +32,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-public let version = "0.41.2"
+public let version = "0.42.0"
 
 /// The standard SwiftFormat config file name
 public let swiftFormatConfigurationFile = ".swiftformat"

Sources/Tokenizer.swift

@@ -2,7 +2,7 @@
 //  Tokenizer.swift
 //  SwiftFormat
 //
-//  Version 0.41.2
+//  Version 0.42.0
 //
 //  Created by Nick Lockwood on 11/08/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormat.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "SwiftFormat",
-  "version": "0.41.2",
+  "version": "0.42.0",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/SwiftFormat.git",
-    "tag": "0.41.2"
+    "tag": "0.42.0"
   },
   "default_subspecs": "Core",
   "subspecs": [

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.41.2</string>
+	<string>0.42.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Tests/TokenizerTests.swift

@@ -1006,8 +1006,8 @@ class TokenizerTests: XCTestCase {
     }
 
     func testEmoji() {
-        let input = "💩"
-        let output: [Token] = [.identifier("💩")]
+        let input = "🙃"
+        let output: [Token] = [.identifier("🙃")]
         XCTAssertEqual(tokenize(input), output)
     }