Update for 0.47.6 release

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [0.47.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.6) (2020-12-08)
+
+- Fixed bug in `redundantReturn` when the `return` statement is not the last line in a block
+- Fixed sorting of tuple cases when using `sortedSwitchCases` rule
+- Added `--nevertrailing` option for excluding functions from the `trailingClosures` rule
+- Added `trailingClosures` exception for Nimble `expect()` function
+- The `redundantFileprivate` rule is now applied correctly to extension members
+- Fixed some bugs with static members when using the `--redundanttype explicit` option
+- SwiftFormat command line tool is now signed for better compliance with Big Sur
+- Updated icon for Big Sur (thanks to Jim Puls for the icon design)
+
 ## [0.47.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.5) (2020-11-27)
 
 - Added `--redundanttype` option for controlling how redundant types are resolved

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

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.47.5</string>
+	<string>0.47.6</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.47.5</string>
+	<string>0.47.6</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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

@@ -6,35 +6,35 @@
 	<dict>
 		<key>Resources/AppIcon.icns</key>
 		<data>
-		49ta0JaEQzFhN907kv6SiH1kchU=
+		TAR2ilFjVscaijXBTHh8rksaW/g=
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		ezhaCzlYMcg+DCcVhWyr2zPTYrE=
+		HLQQzXmuvx+rZR7qTYm9hzCE6VI=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		2fU2nvMZyrFs7BnpeHJUDIXsiL4=
+		G5bRXMFMW5osb821HSWWk8cmcsU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		sDI4h8scr6C+VpGs9sDsKlSHlos=
+		J4dY7BSLkj6sqtgFwYn6WVHu8OQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		GaakEraZ6zCsQcOf9mdUcS8iisU=
+		cqtBWsNnZM1otfkdKIsncZeoNiM=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		OTFiQdyjbKGhf7y0//j0rBzwpQQ=
+		VF0ADYDZ2D8KZ31wGESokmDnYpQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		vWiQZv+PpSkKA7Bna2BMCqSSm3g=
+		NL4wzK7TtWORyEBGFAnTl0Wx8qo=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		cOVxKC65GOKLkI43vPxZ1VPOFqc=
+		BCcE43o6qPcDZGQ/GVPb1Pir0BE=
 		</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>
-			4uiZ8MMzFhi5RBHLZWVQUEPmgJk=
+			NM9WmxAdjm7mxQjqbAYJTOMLN7c=
 			</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>
@@ -218,56 +218,56 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			uL7GZda4f/Vm3xjeFMdkmr5AHvnjhcJFkLlXkF6xsf4=
+			Vxi4/taOTgcZOoDJeCgSpApecfkCp7m6PeF+D4so6mE=
 			</data>
 		</dict>
 		<key>Resources/Assets.car</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wGSONvAv88QQU11V416j0ZvdzV4s3Pc8mx3E4s83rSk=
+			vy4St22eJV7ddFnjcsRLr5xLGDSACKDQCydodo+H7k4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			VTr4r8WHl8IZGK+9bEkD3v5Tr4xa7+MaCGfmiWgysq8=
+			QCeMIxb7EziMPR1ehXPa4T5n7G2hirNAk/zc01sRmKU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			jfgEfs9mtMzNRsAMqXLcCqwS+k8O9Ljwz56p1crProA=
+			u7prGrvVCIbJZm2R6Hvw+t6Z4Ak5neNGNJM4PxOynUs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			kuJIBR/Wkf2cetCmATHoKaSL4iOZN2LMCfAS61GlI4U=
+			m56/9iOBUzaD58zFu90jycCNC+LJ+0oZPzfWmRw7Bcs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			5d+pZvSXd9JUQbZBFvaO8VPInc/wsh/y8JXdW3ibWtI=
+			8ndnoZ50wh832iywkZ+BgBb2lRUqU8/QHpo0ehxJ9zo=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			hbWdz+4JEbLTLPgN6LnzIWMLUYuGwpMnejGF1Aszg40=
+			4g92KKIjxEqxBymlDucWnHznSSKPrnl///rpAUULoeQ=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			s7I/5x9vm8YVeJsCsK4RhYKHnR7BvHyXCjIz0IkZNdQ=
+			xoIb+ozyNwEONtbrkXWV0M719bg93Pwo88Pq6rsnB58=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

README.md

@@ -277,6 +277,8 @@ You can also use `swift run -c release --package-path BuildTools swiftformat "$S
 
 **NOTE:** This will only install the pre-built command-line app, not the source code for the SwiftFormat framework.
 
+**NOTE (2):** When installing this way, GateKeeper may block swiftformat from running until you open it manually the first time by right-clicking in the Finder and selecting "Open".
+
 #### 2) Add a Build phase to your app target
 
 1. Click on your project in the file list, choose your target under `TARGETS`, click the `Build Phases` tab
@@ -757,7 +759,7 @@ Known issues
 
 * The `--self insert` option can only recognize locally declared member variables, not ones inherited from superclasses or extensions in other files, so it cannot insert missing `self` references for those. Note that the reverse is not true: `--self remove` should remove *all* redundant `self` references.
 
-* The `trailingClosures` rule can generate ambiguous code if a function has multiple optional closure arguments, or if multiple functions have signatures differing only by the name of the closure argument. For this reason, the rule is limited to anonymous closure arguments by default, with a whitelist for exceptions.
+* The `trailingClosures` rule can generate ambiguous code if a function has multiple optional closure arguments, or if multiple functions have signatures differing only by the name of the closure argument. For this reason, the rule is limited to anonymous closure arguments by default. You can use the `--trailingclosures` and `--nevertrailing` arguments to explicitly opt in or out of trailing closure support for specific functions.
 
 * The `isEmpty` rule will convert `count == 0` to `isEmpty` even for types that do not have an `isEmpty` method, such as `NSArray`/`NSDictionary`/etc. Use of Foundation collections in Swift code is pretty rare, but just in case, the rule is disabled by default.
 
@@ -793,6 +795,7 @@ Credits
 * [Anthony Miller](https://github.com/AnthonyMDev) - Improvements to wrap/indent logic
 * [Shingo Takagi](https://github.com/zizi4n5) - Several brace-related bug fixes
 * [Juri Pakaste](https://github.com/juri) - Filelist feature
+* [Jim Puls](https://github.com/puls) - Big Sur icon update
 * [Nick Lockwood](https://github.com/nicklockwood) - Everything else
 
 ([Full list of contributors](https://github.com/nicklockwood/SwiftFormat/graphs/contributors))

Sources/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.47.5
+//  Version 0.47.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.47.5"
+let swiftFormatVersion = "0.47.6"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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