Update for 0.48.11 release

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.48.11](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.11) (2020-07-20)
+
+- Fixed parsing error introduced in 0.48.10 involving inline closures inside conditional statements
+- Fixed bug where `redundantSelf` could potentially misidentify tuple labels as local variables
+
 ## [0.48.10](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.10) (2020-07-18)
 
 - Fixed issue with `redundantBackticks` rule incorrectly removing required backticks around underscore

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

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.48.10</string>
+	<string>0.48.11</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.48.10</string>
+	<string>0.48.11</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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

@@ -14,27 +14,27 @@
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		Ir4dp1U2VVS2MyYT4PRftqxW/NI=
+		w1OUVRvAvds0uXulB+16dDTHRcs=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		KL/JxmQKhNgPyJ/NVb36ZRpyugU=
+		Ug1mpfebeNBNbTFRiwfOy/FOPcQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		tO5i4pY+VhIxzKifdyu18vbGvIg=
+		U/Ext2c7grLwS1dx47fW3VrwIeY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		XHwjhy8Mn3sfCeY0LRjlorq9Vd4=
+		kXW5sYF8WyQJe37p1ozsAe2Vyxc=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		0lZeIzu5OUJF0Q/Uaf8nLHPpVx0=
+		Kvra35Ha7AbCztomOuZ0/FMsYh0=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		8ytgza3Oq2J7Mvs0Ri3KELKIC30=
+		2FZ/qCZTu+bM4MSZx4fKhmF3X4M=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
@@ -209,7 +209,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			00/+uoluzSDDPkfbYf5I3TkiZwY=
+			WT9BZhoeJIAh/AMaltaDe8Ym1Cw=
 			</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>
@@ -232,42 +232,42 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			n3Mfal24veRAEQoFvcTO18mjX9P7C3BGS5QeY5+rwHk=
+			2CneYKKjcz0jRTelQBPO/nTiIpiWqJovIpibuVlJ0xE=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			oIjTFzvgQe2fSZ/cubmIRkuIUvhluY6HVjH8zpw/GCs=
+			hnG5wbArf/GdN3XBl53R5wEP94EVJPZRKdRaHEG6S5w=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			bsMh9nMuLmkPJNWnz3/OCwq9PpwuvVtgCMW5wL4aBlc=
+			o5b8hrBQSuYeXdBmU31Dmx0IygtDHnsLIoj2eYYUwuc=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			tRnAnLjalM+Gdc4kDTJygiWM+V061j5FlNrkA9qS86A=
+			DEiOajcSFY2XMPZ3y7wkZrJ+Gy5B/5N3WpF7jxFTJP8=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			arZkJ6VW9ttMtu6T8SgF1CA9KPBmo7zM9ASVzF5Wq1s=
+			thffAq++mbcVKwz/cBrEQRgSlw9AI8s8Co8xPEgpLfM=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			i5xb/Qv6gzSZP3vsjDHQij+iL7FzSr2zGlOHlnu6IqE=
+			LcUcZNtlneViFehLeaYLCZQjY0QIf5mlrCoYtsvg7iw=
 			</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.48.10
+//  Version 0.48.11
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

Sources/SwiftFormat.swift

@@ -32,7 +32,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-let swiftFormatVersion = "0.48.10"
+let swiftFormatVersion = "0.48.11"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1099,7 +1099,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1127,7 +1127,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1223,7 +1223,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1253,7 +1253,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1281,7 +1281,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1311,7 +1311,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.48.10;
+				MARKETING_VERSION = 0.48.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";

Tests/Info.plist

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