Updated for 0.46.2 release

nicklockwood · Sep 5, 2020 · 0d61559 · 0d61559
1 parent f62c7a5
commit 0d61559
Show file tree

Hide file tree

Showing 31 changed files with 41 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.46.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.46.2) (2020-09-05)
+
+- Fixed space being unexpectedly removed before prefix `.` operator by `spaceAroundOperators`
+- Fixed bug where a pair of less-than, greater-than operators could be interpreted as generics
+- Fixed `organizeDeclarations` rule mistaking function with nested class for a lifecycle method
+
 ## [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

diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.46.1</string>
+	<string>0.46.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode
diff --git a/...ents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/XcodeKit b/...ents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/XcodeKit
diff --git a/...xtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist b/...xtension/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.1</string>
+	<string>0.46.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

diff --git a/...n/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat b/...n/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Assets.car b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Assets.car
diff --git a/...r Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib b/...r Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
diff --git a/...nsion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist b/...nsion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist
diff --git a/...ion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib b/...ion/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib
diff --git a/... Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib b/... Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
diff --git a/...code.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib b/...code.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
diff --git a/...rmat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib b/...rmat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
@@ -10,31 +10,31 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		WkTt4TRilzBi3pCN8/s+haN5yKo=
+		bqsKq23jwK5qcyIcXCbarD35+7U=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		6x1Ljk2EvYJ/8uQyB7CZrp87KNM=
+		dzvBbru0m6gkU/bfxPuPnfQRS20=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		UXdjVb9+YH9EJkVDm7fT7HI0WsQ=
+		MODtVVjTi9Ak5CGIzUh1YZ/xxa8=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		6r05jPS3yr6q3FWHE0zrAAXxFuY=
+		DlrJjMEvt2aecMUhFD205KBfOQE=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		ROWvwLGW1+AQ6ptZ1xK1+3WWYuY=
+		t2G5wdgcPFuChUxvuiVnhsPCE58=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		4baSErjo0mLpO/Pj43OGYUWQUuM=
+		k9ehowtkxsKL929DhX3MHtC7ZDo=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		JUfRH1f2yRBFw/DDeQ67USDY4RA=
+		Ce3PvUmuizq1a1fBIuecin84Gf8=
 		</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>
-			Ic7zxGuwiDHtvj/5XXZu4luZNks=
+			86ua6VjMsVv/Lc1Ba1xyfj5O5rQ=
 			</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>
-			WkTt4TRilzBi3pCN8/s+haN5yKo=
+			bqsKq23jwK5qcyIcXCbarD35+7U=
 			</data>
 			<key>hash2</key>
 			<data>
-			u/1M5zHzSxUnlZFiviwdSicTp8pdYUbsXcgspkG6tpA=
+			xt7m/k2/qvtHC4hARyykICic5B5QpwjC9EJ5N0OBSas=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			6x1Ljk2EvYJ/8uQyB7CZrp87KNM=
+			dzvBbru0m6gkU/bfxPuPnfQRS20=
 			</data>
 			<key>hash2</key>
 			<data>
-			MLssQMBYWMwN20xgcgxXRo6Mnm8ZgXzNMZYwtVMwT4o=
+			IIGKEzUreAs2Ox7vijC3ZI2SK96pJlb7/DQSj2mUmLY=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			UXdjVb9+YH9EJkVDm7fT7HI0WsQ=
+			MODtVVjTi9Ak5CGIzUh1YZ/xxa8=
 			</data>
 			<key>hash2</key>
 			<data>
-			S4VQEhmu9hfSmvWQ9tTAPFMfugV/OQ7idFrRgmbDF6w=
+			893WIMDf27t5UOI7WuHtUI018j+SaM7dfQ00kSwe0Hs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			6r05jPS3yr6q3FWHE0zrAAXxFuY=
+			DlrJjMEvt2aecMUhFD205KBfOQE=
 			</data>
 			<key>hash2</key>
 			<data>
-			m1yJrFhPXwN5CFkjXhsjKyizdvhJ4GYJcJwRdmLoMWc=
+			nyH/znZBIul27GIpO/0x1S81ZEiRzmaDO6/wYF93Phk=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ROWvwLGW1+AQ6ptZ1xK1+3WWYuY=
+			t2G5wdgcPFuChUxvuiVnhsPCE58=
 			</data>
 			<key>hash2</key>
 			<data>
-			yBLJNKdiclM7DEtRwoXG1PfIEDKJYA25mulPPnXnLd4=
+			e0eSYkT5dSc7nLAE/BNhzxWEGsZX4bn0Uoe0vH/Wkyk=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			4baSErjo0mLpO/Pj43OGYUWQUuM=
+			k9ehowtkxsKL929DhX3MHtC7ZDo=
 			</data>
 			<key>hash2</key>
 			<data>
-			zkouqHknnTwFniNDKdh1uLKcYJnt4NJxQfPJS5nDQHs=
+			YSlAbV8ldMjA0/NbKHgYvahC5kvAUn55Ok8fjeSCW1s=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			JUfRH1f2yRBFw/DDeQ67USDY4RA=
+			Ce3PvUmuizq1a1fBIuecin84Gf8=
 			</data>
 			<key>hash2</key>
 			<data>
-			M/JpjM70Sfbj3aOfHuj0EkutkdeUBZndAj/VOoIfJo8=
+			39d4JSpjJsFtfA7n1xjOyCwdD5105+Gk0kRJtEQWtA0=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift
@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.46.1
+//  Version 0.46.2
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.46.1</string>
+	<string>0.46.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
@@ -32,7 +32,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-let swiftFormatVersion = "0.46.1"
+let swiftFormatVersion = "0.46.2"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name

diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
@@ -2,7 +2,7 @@
 //  Tokenizer.swift
 //  SwiftFormat
 //
-//  Version 0.46.1
+//  Version 0.46.2
 //
 //  Created by Nick Lockwood on 11/08/2016.
 //  Copyright 2016 Nick Lockwood

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

diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj
@@ -1220,7 +1220,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.46.1;
+				MARKETING_VERSION = 0.46.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1247,7 +1247,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.46.1;
+				MARKETING_VERSION = 0.46.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1270,7 +1270,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;
+				MARKETING_VERSION = 0.46.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1295,7 +1295,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;
+				MARKETING_VERSION = 0.46.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.46.1</string>
+	<string>0.46.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>