Updated for 0.46.1 release

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [0.46.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.46.1) (2020-08-30)
+
+- Fixed bug where computed property bodies were sometimes wrongly identified as closures
+- Fixed spurious blank lines in output when formatting
+- The `organizeDeclarations` rule no longer inserts blank lines at start/end of scopes
+- The `organizeDeclarations` rule now groups typealiases with types instead of properties
+- Improved heuristic for matching `// MARK:` comments in `organizeDeclarations`
+- Configuration file now allows line continuations using `\` delimiter
+
 ## [0.46.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.46.0) (2020-08-28)
 
 - Added `organizeDeclarations` rule for grouping and organizing type members

EditorExtension/Extension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.46.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

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

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.46.0</string>
+	<string>0.46.1</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.46.0</string>
+	<string>0.46.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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

@@ -10,31 +10,31 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		U4/3np5ZtPpo66xXZoSjMU91mR4=
+		WkTt4TRilzBi3pCN8/s+haN5yKo=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		dzvBbru0m6gkU/bfxPuPnfQRS20=
+		6x1Ljk2EvYJ/8uQyB7CZrp87KNM=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		rIQIJ+UFAtVleeJmDuXZfcJw+EY=
+		UXdjVb9+YH9EJkVDm7fT7HI0WsQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		oogcd8puZ708EZURul3r5L6njuI=
+		6r05jPS3yr6q3FWHE0zrAAXxFuY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		wshPSAgoJXua0n4X8yUp1jHKLnI=
+		ROWvwLGW1+AQ6ptZ1xK1+3WWYuY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		VzGwRdxswZCA4r5IaaGYQN8fyFA=
+		4baSErjo0mLpO/Pj43OGYUWQUuM=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		C6eSL4OAikW8s5Uv3oz7/Mm0Qbc=
+		JUfRH1f2yRBFw/DDeQ67USDY4RA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
@@ -119,7 +119,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			KRINOGvykWrQHjLhqkr4sBsVbg0=
+			Ic7zxGuwiDHtvj/5XXZu4luZNks=
 			</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>
@@ -139,77 +139,77 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			U4/3np5ZtPpo66xXZoSjMU91mR4=
+			WkTt4TRilzBi3pCN8/s+haN5yKo=
 			</data>
 			<key>hash2</key>
 			<data>
-			1TfgC8gXg8tiRP33i6238P6YuyZpQUWgX/S1BIbS4/Y=
+			u/1M5zHzSxUnlZFiviwdSicTp8pdYUbsXcgspkG6tpA=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			dzvBbru0m6gkU/bfxPuPnfQRS20=
+			6x1Ljk2EvYJ/8uQyB7CZrp87KNM=
 			</data>
 			<key>hash2</key>
 			<data>
-			IIGKEzUreAs2Ox7vijC3ZI2SK96pJlb7/DQSj2mUmLY=
+			MLssQMBYWMwN20xgcgxXRo6Mnm8ZgXzNMZYwtVMwT4o=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			rIQIJ+UFAtVleeJmDuXZfcJw+EY=
+			UXdjVb9+YH9EJkVDm7fT7HI0WsQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			UsCICT79lmtFdUJya4TrbWFXRn1XrIytUEIZ8Hndczo=
+			S4VQEhmu9hfSmvWQ9tTAPFMfugV/OQ7idFrRgmbDF6w=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			oogcd8puZ708EZURul3r5L6njuI=
+			6r05jPS3yr6q3FWHE0zrAAXxFuY=
 			</data>
 			<key>hash2</key>
 			<data>
-			+kAHHbhkVMtDIQOl/T7G4Nh0k467xAfysFmJT4nzVkA=
+			m1yJrFhPXwN5CFkjXhsjKyizdvhJ4GYJcJwRdmLoMWc=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			wshPSAgoJXua0n4X8yUp1jHKLnI=
+			ROWvwLGW1+AQ6ptZ1xK1+3WWYuY=
 			</data>
 			<key>hash2</key>
 			<data>
-			FVkvBKLqG3e4IjBg9kk3y0dffEIJXH+sZQkfAcE8K/I=
+			yBLJNKdiclM7DEtRwoXG1PfIEDKJYA25mulPPnXnLd4=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			VzGwRdxswZCA4r5IaaGYQN8fyFA=
+			4baSErjo0mLpO/Pj43OGYUWQUuM=
 			</data>
 			<key>hash2</key>
 			<data>
-			uIu5lgebxXUyzXnc/5SEHbnIlsAhwoF/Q4AwDrdIZZA=
+			zkouqHknnTwFniNDKdh1uLKcYJnt4NJxQfPJS5nDQHs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			C6eSL4OAikW8s5Uv3oz7/Mm0Qbc=
+			JUfRH1f2yRBFw/DDeQ67USDY4RA=
 			</data>
 			<key>hash2</key>
 			<data>
-			lNz9Er6/arH1MmowpuycPwnhT9heUyTwRuLoub2d3GM=
+			M/JpjM70Sfbj3aOfHuj0EkutkdeUBZndAj/VOoIfJo8=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

README.md

@@ -418,15 +418,15 @@ You can disable rules individually using `--disable` followed by a list of one o
 --enable isEmpty
 ```
 
-If you prefer, you can place your enabled/disabled rules on separate lines instead of using commas
+If you prefer, you can use multiple `--enable`/`--disable` arguments instead of using commas:
 
 ```bash
 --disable indent
 --disable linebreaks
 --disable redundantSelf
 ```
 
-or use the line continuation character `\` to omit the `--disable` for each rule:
+Alternatively, you can use the line continuation character `\` to wrap a single argument over multiple line:
 
 ```bash         
 --disable          \
@@ -435,15 +435,16 @@ or use the line continuation character `\` to omit the `--disable` for each rule
     redundantSelf
 ```
 
-To avoid automatically opting-in to new rules when SwiftFormat is updated, you can use the`--rules` argument to *only* enable the rules you specify:
+To avoid automatically opting-in to new rules when SwiftFormat is updated, use the`--rules` argument to *only* enable the rules you specify:
 
 ```bash
 --rules indent,linebreaks
 ```
 
-Like before, you may use the line continuation character `\` to list the rules on separate lines:
+As above, you may include multiple `--rules` arguments, or use the line continuation character `\` to wrap the rules onto separate lines:
 
 ```bash
+--rules redundantSelf
 --rules         \
     indent,     \
     linebreaks

Sources/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.46.0
+//  Version 0.46.1
 //
 //  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.46.0</string>
+	<string>0.46.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/SwiftFormat.swift

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

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1188,7 +1188,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.46.0;
+				MARKETING_VERSION = 0.46.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1215,7 +1215,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.46.0;
+				MARKETING_VERSION = 0.46.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1238,6 +1238,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = EditorExtension/Extension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
+				MARKETING_VERSION = 0.46.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1262,6 +1263,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = EditorExtension/Extension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
+				MARKETING_VERSION = 0.46.1;
 				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.46.0</string>
+	<string>0.46.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>