Update for 0.54.6 release

nicklockwood · Oct 8, 2024 · 86ed209 · 86ed209
1 parent 5a2966e
commit 86ed209
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## [0.54.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.54.6) (2024-10-07)
+
+- Fixed incorrect wrapping of conditional bodies inside single-line string literals
+- Fixed properties inside type with where clause being treated as local scope
+- Fixed regression in `wrapMultilineStatementBraces` rule
+- Fixed tokenizing of a throwing closure type in a generics clause
+- Fixed bug in `parseDeclarations` where incorrect tokens could cause rules to time out
+- Fixed issue where `organizeDeclarations` would add extra blank lines if type had blank lines with spaces
+- Added known issue to README for `preferForLoop` rule
+
 ## [0.54.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.54.5) (2024-09-11)
 
 - Fixed crash in `unusedArguments` rule

diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
@@ -32,7 +32,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-let swiftFormatVersion = "0.54.5"
+let swiftFormatVersion = "0.54.6"
 public let version = swiftFormatVersion
 
 /// The standard SwiftFormat config file name
@@ -205,13 +205,14 @@ public func enumerateFiles(withInputURL inputURL: URL,
                 }
             }
         } else if resourceValues.isDirectory == true {
-            var options = options
+            var tempOptions = options
             do {
-                try processDirectory(inputURL, with: &options, logger: logger)
+                try processDirectory(inputURL, with: &tempOptions, logger: logger)
             } catch {
                 onComplete { throw error }
                 return
             }
+            let options = tempOptions
             let enumerationOptions: FileManager.DirectoryEnumerationOptions = .skipsHiddenFiles
             guard let files = try? manager.contentsOfDirectory(
                 at: inputURL, includingPropertiesForKeys: keys, options: enumerationOptions
@@ -220,6 +221,7 @@ public func enumerateFiles(withInputURL inputURL: URL,
                 return
             }
             for url in files where !url.path.hasPrefix(".") {
+                let options = options
                 queue.async(group: group) {
                     let outputURL = outputURL.map {
                         URL(fileURLWithPath: $0.path + url.path[inputURL.path.endIndex ..< url.path.endIndex])

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

diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj
@@ -1162,7 +1162,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
@@ -1195,7 +1195,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
@@ -1302,7 +1302,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1333,7 +1333,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1361,7 +1361,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1390,7 +1390,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 0.54.5;
+				MARKETING_VERSION = 0.54.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
 				PRODUCT_NAME = SwiftFormat;
 				PROVISIONING_PROFILE_SPECIFIER = "";