Updated for 0.44.10 release

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Change Log
 
+## [0.44.10](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.10) (2020-05-14)
+
+- Fixed bug where `--specifierorder` option values were sorted alphabetically
+- Fixed a couple of bugs in `hoistPatternLet` when `--patternlet` is set to `inline`
+- Added support for hoisting/unhoisting `var` and `let` in `do ... catch` patterns
+- Added error if `--specifierorder` contains duplicate values
+
 ## [0.44.9](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.9) (2020-05-05)
 
 - Added `--specifierorder` argument for overriding default order used by `specifiers` rule
 - Added `--nowrapoperators` argument for preventing `wrap` rule breaking at specific operators
 - The `redundantNilInit` rule no longer removes `nil` defaults from vars in structs using synthesized init
-- Fix indenting of trailing comment delimiter in multiline comments
+- Fixed indenting of trailing comment delimiter in multiline comments
 
 ## [0.44.8](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.8) (2020-05-01)
 
@@ -26,7 +33,7 @@
 
 - Fixed indenting of wrapped closures after a switch statement
 - Fixed bug with `redundantNilInit` removing `nil` for properties using parameterized property wrappers
-- Fixed `redundantRawValues` rule not removing values for backtick-escaped case names
+- Fixed `redundantRawValues` rule not removing values for back-tick-escaped case names
 - Improved error messages for misnamed rules
 - Documentation improvements
 
@@ -51,7 +58,7 @@
 - Allman braces are now applied correctly for lines that end in a numeric literal
 - Blank line is now removed when stripping a redundant `return` keyword on its own line
 - Fixed space being inserted before the `.` in a nested PropertyWrapper expression
-- Fixed `return` being incorrectly removed inside `if` statements containing an unparenthesized closure
+- Fixed `return` being incorrectly removed inside `if` statements containing an un-parenthesized closure
 
 ## [0.44.3](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.3) (2020-02-20)
 

EditorExtension/Application/Info.plist

@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.9</string>
+	<string>$(MARKETING_VERSION)</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.9</string>
+	<string>0.44.10</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18G3020</string>
+	<string>18G4032</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
@@ -32,13 +32,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.9</string>
+	<string>0.44.10</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18G3020</string>
+	<string>18G4032</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.9</string>
+	<string>0.44.10</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>
-		XE2ysufScM0l9cM4MW2lC/MB+9s=
+		yDzi803FtuKXSXphV9YF9Rl5p/c=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		AtN1NV44zY/hXYsrED2Uj8KwRL4=
+		H5MFFivg2YeAI0zoeZjACyjGplw=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		Gyhb5r7rKkk1VKcTfnY+EBqK1Uo=
+		1pg4qpOpO1GTSQoc+eLgf2uhhns=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		A65CnnzQcneUPyK1sWRyyGV2Fm0=
+		j129kJxTk01XWhAihKvcfdS4BJU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		Gyc3jWRDywjwIjXW4MvhFCAVELk=
+		P8J03gmbhaKjhmPnqNIpqLvsMgQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		QI6nOoaGSmpWE3ijV/SP+LqXEAA=
+		sOaUe8hdPlsHL3EohVNEESrX7JE=
 		</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>
-			uOLPw07iqPZUAyxX7m/Hx18uGOk=
+			4XIki3wFiicSDhyY/dDgA6eZxnE=
 			</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>
-			XE2ysufScM0l9cM4MW2lC/MB+9s=
+			yDzi803FtuKXSXphV9YF9Rl5p/c=
 			</data>
 			<key>hash2</key>
 			<data>
-			4bLge7m/hJl2sBBTU9wBqPBqqqLleJ8C9aEl9EPVTOw=
+			8xpUQy4ofQLn3YY7L1xwsSwOAL36AjC8pct0dd5PBy4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			AtN1NV44zY/hXYsrED2Uj8KwRL4=
+			H5MFFivg2YeAI0zoeZjACyjGplw=
 			</data>
 			<key>hash2</key>
 			<data>
-			EU7OW5GNX7yGsaLOyp5dnNMYvwvBrPEDUYPCtHkgIQ0=
+			WEmldoFHyerrsVYWjFgX1Qg6eMq1zUglogiCd2+jPY0=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Gyhb5r7rKkk1VKcTfnY+EBqK1Uo=
+			1pg4qpOpO1GTSQoc+eLgf2uhhns=
 			</data>
 			<key>hash2</key>
 			<data>
-			wDXyVSli8dWoRHyCo6N8E4gWcGRpmrjmlirDc16pmsc=
+			ujCzPvGjwUF/ele1+MjOTdwDhXxbMm3OSPCjfj34ju4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			A65CnnzQcneUPyK1sWRyyGV2Fm0=
+			j129kJxTk01XWhAihKvcfdS4BJU=
 			</data>
 			<key>hash2</key>
 			<data>
-			XWBGA6nD7D/X3MNWbaYz3hhlQZEAZsfAgrK8AZDRS6s=
+			F4boR2I2gf4pUSWQlrtjwl5D3eWlTgPbXOeXu5q8S/E=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Gyc3jWRDywjwIjXW4MvhFCAVELk=
+			P8J03gmbhaKjhmPnqNIpqLvsMgQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			V4KTUeeLlbh2RIa99YkGJgsn0zrk+8qcELJNDyJFP5k=
+			vYL+S309E55NyydpNnJ08KNuy2pq87jJmciN2YtJCWM=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			QI6nOoaGSmpWE3ijV/SP+LqXEAA=
+			sOaUe8hdPlsHL3EohVNEESrX7JE=
 			</data>
 			<key>hash2</key>
 			<data>
-			rQaOCMR2ZOQ508JMV05TlanmZZcDbQtlh+LGNqLzXCE=
+			go47GRkfbXgC7o0miTKgxnNdFFAdQGcQ5Qh3ACVSpYM=
 			</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.44.9
+//  Version 0.44.10
 //
 //  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.9</string>
+	<string>0.44.10</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.9"
+public let version = "0.44.10"
 
 /// The standard SwiftFormat config file name
 public let swiftFormatConfigurationFile = ".swiftformat"

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1161,6 +1161,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 0.44.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1187,6 +1188,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 0.44.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Tests/Info.plist

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