Update for 0.48.2 release

Signed-off-by: Nick Lockwood <nick@charcoaldesign.co.uk>

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.48.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.2) (2020-05-16)
+
+- Fixed wrapping of generic property wrapper attributes
+- Fixed bug where trailing comma could be inserted inside a collection type signature
+
 ## [0.48.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.48.1) (2020-05-08)
 
 - Fixed bug where `typeSugar` rule triggered a Swift bug inside case statements

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20D91</string>
+	<string>20E241</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDocumentTypes</key>
@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.48.1</string>
+	<string>0.48.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -46,19 +46,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12D4e</string>
+	<string>12E262</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.1</string>
+	<string>11.3</string>
 	<key>DTSDKBuild</key>
-	<string>20C63</string>
+	<string>20E214</string>
 	<key>DTSDKName</key>
-	<string>macosx11.1</string>
+	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1240</string>
+	<string>1250</string>
 	<key>DTXcodeBuild</key>
-	<string>12D4e</string>
+	<string>12E262</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>7</string>
+	<string>3</string>
 	<key>CFBundleShortVersionString</key>
-	<string>12.4</string>
+	<string>12.5</string>
 	<key>CFBundleVersion</key>
-	<string>17801</string>
+	<string>18205</string>
 	<key>ProductBuildVersion</key>
-	<string>12D4e</string>
+	<string>12E262</string>
 	<key>ProjectName</key>
 	<string>IDEFrameworks</string>
 	<key>SourceVersion</key>
-	<string>17801000000000000</string>
+	<string>18205000000000000</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>
-		rS644k8Lu42gOT+aELQwtqBBrgg=
+		e9ktAwXrKvI1QSykOIUtPw9Qetg=
 		</data>
 		<key>Resources/version.plist</key>
 		<data>
-		njSRecEe5mCvN4YTnIbssbtyrAo=
+		NwptOEsMC8NqofclUxWLcsMU7UE=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -19,14 +19,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SWJ8EHaKmDK9ag8LlDKgivOoVxux1pJefSBiHZvKKr4=
+			vtAUYonK14SyF9FQOLtvrdiqo7eGiLh5nymgY1oJIVk=
 			</data>
 		</dict>
 		<key>Resources/version.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			A5UbcZISi0K4o0fLnhWALTA4sMWN0E7cziezyv4z/GA=
+			eYMc5ZoMKbaAyTW07n8Lt/BHKXYtamsq+7KJQ/5wcbc=
 			</data>
 		</dict>
 	</dict>

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>20D91</string>
+	<string>20E241</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.48.1</string>
+	<string>0.48.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,19 +27,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12D4e</string>
+	<string>12E262</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.1</string>
+	<string>11.3</string>
 	<key>DTSDKBuild</key>
-	<string>20C63</string>
+	<string>20E214</string>
 	<key>DTSDKName</key>
-	<string>macosx11.1</string>
+	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1240</string>
+	<string>1250</string>
 	<key>DTXcodeBuild</key>
-	<string>12D4e</string>
+	<string>12E262</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>
-			iaVtQCofy6jxTpTejbAOrHnIbWA=
+			v84jFaIuMaciVH2ABn3ohEUHzgk=
 			</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>
-		gbLTp/AI7g9i1c3Se53BAX8V+48=
+		Comkf49g/mY/sD0w8JUguL096xE=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		/ZiaGPGnDA4YLqKgm0/qOyTD4SQ=
+		/mMHOf5Ai+OfYQPnTPeFEa1t6c0=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		/5smlOjxDfd6kV2aUYVBkItcuYw=
+		bZDLSwMw/q6o0rb8EerUb/Ra5Bk=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		y5/6XzqAKBgrRjWBf3mWrRGn9Ds=
+		DZJHXaO46vWodaEEP4cgTnjbXac=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		gCvDiHnJqtAcDpl3lY+RxltDhCY=
+		Ru6Tzq+U4BmRHlcgik54jwhkhuo=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		rVtGN6tabBokFFou3sk7/KbSiuI=
+		hEZSVXQpLrdCSs6qLSRjtBOKID8=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		PtOZQru1aVcSf9mXXZMFRKuM3tQ=
+		i6lqZRNpV8OY6U9Sync/dmsDbrs=
 		</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>
-			Oep8DVvgJNOuLkkQk6oJwbmdzsY=
+			RS6fB+qMe3/BvR2OFClgAaeUUac=
 			</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>
-			1gAo6mSNXGfNbeldi/9fPoLV9rHoch91SR5yRKtlmts=
+			zH20EvrZWnSynpIJx4f672qE2aft6B2CPOcy44hk/y0=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			1ghvdoD60upQkW7mT86D4zgzmpAokv4xZtC8z4N20yE=
+			uyzphal1KHU7vlfyMl/y47ql+XyzDVMxImjdZil5HrI=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Yz1hmOHYugHox9nCVkioQSnmy07Umpv9KVdJiIYOtF0=
+			TSdFaFN1OMVRN/1roFlrJYLHKjNlvDBpB1aBBFc2JFA=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fVdUWtKZptOs/SuzEKgR1pFz8WX12qu/xVtnlOMxFE0=
+			quiszhR6JyQRmQ3WKtLN2mgluyiR+4fselC6Uo8s5y8=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			c5f7d1GsMX6LEjRQRXiocfNef217S16/HR6B6HmJ2+8=
+			O6BvO7V6zIghOtnqz1+IlIUp71b2nEztoT3REDPiXIY=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			QbuMuQIhxt81DmJ3MnesQjoNJQmCz1kwoHLZSTWjkxg=
+			l6HyCAdpkMRfn45uzj59xPy0JocsId0LtwgnSG5LLmU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Cqs5hKvch1/06Ks+vTHA7LH5PJinhCSC6hnTjbbOPcU=
+			uis7yvbxVeUasWsDcZP/Ze5s99HP9MjhbcDR+93Nuo8=
 			</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.1
+//  Version 0.48.2
 //
 //  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.1"
+let swiftFormatVersion = "0.48.2"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1099,7 +1099,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.48.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1;
+				MARKETING_VERSION = 0.48.2;
 				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.1</string>
+	<string>0.48.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>