Update for 0.48.6 release

CHANGELOG.md

@@ -1,11 +1,17 @@
 # Change Log
 
+## [0.48.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.6) (2020-06-23)
+
+- Fixed bug where `actor` variables were incorrectly interpreted as a keyword in certain cases
+- The `redundantBackticks` rule no longer removes required backticks around `actor` properties
+- Doc comments containing TODO: are no longer converted to regular comments if it would mangle the docs
+
 ## [0.48.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.5) (2020-06-15)
 
 - Fixed bug when parsing generic result builder attributes, leading to incorrect spacing
 - Fixed bug where wrapped function body was not double-indented as it should have been
 - Parser now correctly handles `isolated` and `nonisolated` modifiers on `actor` members
-- Fixed bug where space was imncorrectly removed between closure capture list and arguments
+- Fixed bug where space was incorrectly removed between closure capture list and arguments
 - Fixed bug with indenting of wrapped method chains
 
 ## [0.48.4](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.4) (2020-05-30)
@@ -33,7 +39,7 @@
 - Fixed bug where `typeSugar` rule triggered a Swift bug inside case statements
 - Fixed double-indenting of trailing closure body on a wrapped line
 - Fixed compilation failure when installing SwiftFormat using Swift Package Manager
-- Fixed wrapping of namespaced property wrapper attributes
+- Fixed wrapping of name-spaced property wrapper attributes
 - Fixed bug where `redundantReturn` rule removed required return inside `catch` statement
 - Fixed issue where `redundantType` rule introduced compilation warnings by removing explicit Void type
 - Fixed bug where trailing comma could be inserted inside a subscript nested inside a collection

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

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.48.5</string>
+	<string>0.48.6</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -46,7 +46,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12E262</string>
+	<string>12E507</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
@@ -56,9 +56,9 @@
 	<key>DTSDKName</key>
 	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1250</string>
+	<string>1251</string>
 	<key>DTXcodeBuild</key>
-	<string>12E262</string>
+	<string>12E507</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/Resources/version.plist

@@ -5,16 +5,16 @@
 	<key>BuildAliasOf</key>
 	<string>IDEFrameworks</string>
 	<key>BuildVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>CFBundleShortVersionString</key>
-	<string>12.5</string>
+	<string>12.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>18205</string>
+	<string>18212</string>
 	<key>ProductBuildVersion</key>
-	<string>12E262</string>
+	<string>12E507</string>
 	<key>ProjectName</key>
 	<string>IDEFrameworks</string>
 	<key>SourceVersion</key>
-	<string>18205000000000000</string>
+	<string>18212000000000000</string>
 </dict>
 </plist>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		e9ktAwXrKvI1QSykOIUtPw9Qetg=
+		pn6y7jghO1WlUQniCZ8RF5QhF88=
 		</data>
 		<key>Resources/version.plist</key>
 		<data>
-		NwptOEsMC8NqofclUxWLcsMU7UE=
+		Mf2ybpHuKm+dHh8S/DboldmJy3E=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -19,14 +19,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			vtAUYonK14SyF9FQOLtvrdiqo7eGiLh5nymgY1oJIVk=
+			v79nO8NDbYbLvZ2hiZPxHikv9Q26HusCPhrRlzOsoS8=
 			</data>
 		</dict>
 		<key>Resources/version.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			eYMc5ZoMKbaAyTW07n8Lt/BHKXYtamsq+7KJQ/5wcbc=
+			DvwInq7XP8QHI5WEpqC3X0jjOnG/IY+SKyks3CIDoVg=
 			</data>
 		</dict>
 	</dict>

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.5</string>
+	<string>0.48.6</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>12E262</string>
+	<string>12E507</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
@@ -37,9 +37,9 @@
 	<key>DTSDKName</key>
 	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1250</string>
+	<string>1251</string>
 	<key>DTXcodeBuild</key>
-	<string>12E262</string>
+	<string>12E507</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>NSExtension</key>

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

@@ -10,7 +10,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			v84jFaIuMaciVH2ABn3ohEUHzgk=
+			wDuDBP45ityCn5C8VwLEPTvUYQE=
 			</data>
 			<key>requirement</key>
 			<string>anchor apple generic and identifier "com.apple.dt.XcodeKit" 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>

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

@@ -10,31 +10,31 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		KC25JJ2f2zANvUUsJTVqjBXD+mU=
+		js+PUP9vzfdK5eMYGBWPQdECXvY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		w1OUVRvAvds0uXulB+16dDTHRcs=
+		/Wk4agHdH5LQBNUNHzOccgb/51c=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		PtGBRaq3er7+2qScFgVzfpHoDPY=
+		vBWgxnCM38q/qpTwMtnflnYU/B8=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		KxVWvt6/VSz6yKwB1IFwWMD6D7U=
+		yKExJkRvfy/MH/lGUMl24v7UwAc=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		i2PL27a31XMNV4UozHxtlsPY3RQ=
+		049I+dWZkv7ncnkHh9Sl0kfSugs=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		avqeo1ujQY2qutHQc96d21M9d44=
+		TjnVATq/Mn/phXm4c39Of5Ppuyc=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		M5bfd/mZWjT6eWk3Evj2h44xlw4=
+		J4vIaQtFvNmKJdtvxtR0PM+nzcE=
 		</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>
-			dAO85W+vDqM/ySXTcaM39LAFECk=
+			gBSl178Pxf1W2BHGsEjd4R9WNd8=
 			</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>
@@ -225,49 +225,49 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			H/VjUCaVbZBpx/Tm3IEiyvbwpx1NwO2aaI8LHcB8sGo=
+			wabgzocgFufjTt9GrtfXKizYclrkW8qUQ6WeOD1LKVU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			2CneYKKjcz0jRTelQBPO/nTiIpiWqJovIpibuVlJ0xE=
+			7BIWnTfmB0XzEwPhKL+sLR8Iw69ljH/+gUwCbfex6/A=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			zKi8breNPgAamqXkdZtnt43llqDClLolqKInfYLOH4o=
+			92Kf6+peRMekQMs/CoIEFlGXm1hFe3F1TUA/mOpfxik=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fuRPpB2bHDyE8WBpcZMbbFWcEFj9H/uyp+dz7vjyJCw=
+			3y991cumgKOYsMXFwOQGwvlPyJM2gZY+LGQmVQKROJ4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wHIvpKPMMfSX2F/L6ljVaZxHnEvNaLycg6D0pcCaclI=
+			7bE1t/vcqaU+nLcC6M21kMpIV2JtXvugYq0L/hc+P/c=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			6zua/dKQNTHFmGWpXfNSw29v3Xi0lBvZuezq5ppG+Xc=
+			k2jY41Sf6LSzEAV9yReXUQKHaSUqARd0/X53QV4n6xI=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fbEvXXUVp+QDQbMBbrkoPjnPO+drpJHzfqSizBtx4v4=
+			XBvwYOgWYGPzAQahB+b6adV01e75E3xs/6Pb90n8REo=
 			</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.54
+//  Version 0.48.6
 //
 //  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.5"
+let swiftFormatVersion = "0.48.6"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1099,7 +1099,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.48.5;
+				MARKETING_VERSION = 0.48.6;
 				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.5;
+				MARKETING_VERSION = 0.48.6;
 				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.5;
+				MARKETING_VERSION = 0.48.6;
 				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.5;
+				MARKETING_VERSION = 0.48.6;
 				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.5;
+				MARKETING_VERSION = 0.48.6;
 				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.5;
+				MARKETING_VERSION = 0.48.6;
 				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.54</string>
+	<string>0.48.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>