Updated for 0.44.1 release

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [0.44.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.1) (2020-01-26)
+
+- Fixed `spaceInsideComments` rule mangling preformatted comments with multiple slashes
+- Fixed `redundantFileprivate` breaking code relying on type-inference for `init`
+- Reverted overly aggressive argument wrapping change in 0.44.0
+- Fixed `redundantParens` rule breaking `#if` statements without space before argument
+- Fixed `// swiftformat:disable` directives not affecting `wrap` or `wrapArguments` rules
+- Fixed bug where `yodaConditions` rule caused formatting to never terminate
+- Fixed crash in `fileHeader` rule
+
 ## [0.44.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.0) (2020-01-15)
 
 - Xcode Extension now includes Lint File option

EditorExtension/Application/Info.plist

@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.0</string>
+	<string>0.44.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>

EditorExtension/Extension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.0</string>
+	<string>0.44.1</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.44.0</string>
+	<string>0.44.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -42,7 +42,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11C29</string>
+	<string>11C504</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -52,7 +52,7 @@
 	<key>DTXcode</key>
 	<string>1130</string>
 	<key>DTXcodeBuild</key>
-	<string>11C29</string>
+	<string>11C504</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

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.44.0</string>
+	<string>0.44.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11C29</string>
+	<string>11C504</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -37,7 +37,7 @@
 	<key>DTXcode</key>
 	<string>1130</string>
 	<key>DTXcodeBuild</key>
-	<string>11C29</string>
+	<string>11C504</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>NSExtension</key>

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>
-		z3v+1cdDj01hzKIHftQ0wvQIFT0=
+		X2322Lr2544+8FQR6+cfsbi8JTs=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		30a2JNiEYlWWB5EtEWvnioWAFT4=
+		lY/kCgrPo5ztx0jRzltXY2PshGY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		eEf3+O9zyBzABmZ7PyaRrZs+UUg=
+		6q99H7UBnYyGCcuaECYPS/mZLfU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		z0rSRIZnTVWPDlgmwfB3oMOwwnw=
+		KaIxFvYSpdHn5mhgGRhjf2KKTWQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		Qukwfii28V82HY5FflGVyGys2rs=
+		j8IW45Gfn3QYFsP1BIj8HJbtFnQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		iH9gMGmzMd0oDOCZADqmdMRfFkk=
+		kHuwFiZzxGiNNXE4/zTTLDZnBiw=
 		</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>
-			vvlXfO9Z3w+MOqh0HjklJVusRmw=
+			v2cs3i3AVnRLhD1XAjBv9DYGxDI=
 			</data>
 			<key>requirement</key>
 			<string>anchor apple generic and identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "8VQKF583ED")</string>
@@ -120,66 +120,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			z3v+1cdDj01hzKIHftQ0wvQIFT0=
+			X2322Lr2544+8FQR6+cfsbi8JTs=
 			</data>
 			<key>hash2</key>
 			<data>
-			2kaefwZJg37W3tdj1uF3JmisLBMU+Avswd8xW73gmnY=
+			1SiPbjWdPEouvtjiWIrJJ+Xoc0PWXLIMh15kZdTZWn4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			30a2JNiEYlWWB5EtEWvnioWAFT4=
+			lY/kCgrPo5ztx0jRzltXY2PshGY=
 			</data>
 			<key>hash2</key>
 			<data>
-			dQIYSXfGpiAlsGRJXLgZsKqifNk6jUq+yB3+x1q0++k=
+			wKBK1b36B3L+Q267vzeAqoWF7TTHV1zNoSRw69tVHLg=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			eEf3+O9zyBzABmZ7PyaRrZs+UUg=
+			6q99H7UBnYyGCcuaECYPS/mZLfU=
 			</data>
 			<key>hash2</key>
 			<data>
-			CFFUzQqKxEr4kJIp7bPxTRyDQBO0ZXDSwRgdMqPoD6w=
+			MsVtFpFd57GORYrOek1aAEE+8ooMrCJ7kWanpeT2aaw=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			z0rSRIZnTVWPDlgmwfB3oMOwwnw=
+			KaIxFvYSpdHn5mhgGRhjf2KKTWQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			XSRKajS/vx1LNzjcx/u47RtLyLKTNVBNjqe2Q9entGo=
+			1hb7uBI4w2AdbRZ/j7yRRvFBryIt58c/8gRyLq7TWdA=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Qukwfii28V82HY5FflGVyGys2rs=
+			j8IW45Gfn3QYFsP1BIj8HJbtFnQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			iStrXCG6nVOK+y0BV9HodFAVYb1mtTu/CVfBiF46PeA=
+			bGCaCnYGaTWQnZdSCU6T7Fkb9F9VnaouRQKMHhTdPBU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			iH9gMGmzMd0oDOCZADqmdMRfFkk=
+			kHuwFiZzxGiNNXE4/zTTLDZnBiw=
 			</data>
 			<key>hash2</key>
 			<data>
-			Lo6TAehMBfdDBR76bJ8Lmu6HcSMTsiDoHyOcJDhQ2Y4=
+			JHlz6B2Z1Xx+7wyDHWOetzJssn1rgtHfnCut8WAG7xU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

README.md

@@ -1,3 +1,4 @@
+[![PayPal](https://img.shields.io/badge/paypal-donate-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9ZGWNK5FEZFF6&source=url)
 [![Travis](https://api.travis-ci.org/nicklockwood/SwiftFormat.svg?branch=master)](https://travis-ci.org/nicklockwood/SwiftFormat)
 [![Coveralls](https://coveralls.io/repos/github/nicklockwood/SwiftFormat/badge.svg)](https://coveralls.io/github/nicklockwood/SwiftFormat)
 [![Swift 4.2](https://img.shields.io/badge/swift-4.2-red.svg?style=flat)](https://developer.apple.com/swift)
@@ -28,6 +29,7 @@ Table of Contents
     - [File headers](#file-headers)
 - [FAQ](#faq)
 - [Known issues](#known-issues)
+- [Tip Jar](#tip-jar)
 - [Credits](#credits)
 
 
@@ -700,6 +702,14 @@ Known issues
 * When running on Linux, the `--symlinks` option has no effect, and some of the `fileHeader` placeholders are not supported.
 
 
+Tip Jar
+-----------
+
+SwiftFormat is not a commercially-funded product, it's a labour of love given freely to the community. If you find it useful, please consider making a donation.
+
+[![Donate via PayPal](https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9ZGWNK5FEZFF6&source=url)
+
+
 Credits
 ------------
 

Sources/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.44.0
+//  Version 0.44.1
 //
 //  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.44.0</string>
+	<string>0.44.1</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.44.0"
+public let version = "0.44.1"
 
 /// The standard SwiftFormat config file name
 public let swiftFormatConfigurationFile = ".swiftformat"

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/xcshareddata/xcschemes/SwiftFormat (Command Line Tool).xcscheme

@@ -41,8 +41,8 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Tests/Info.plist

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