diff --git a/CHANGELOG.md b/CHANGELOG.md index 457bef74..42dacc38 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [0.49.17](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.49.17) (2022-08-16) + +- Fixed unexpected token error occurring at end of scope after a `<<` operator +- Fixed bug where function arguments named `async:` would expectedly be indented +- SwiftFormat command-line tool now logs the location and version of .swift-version files it encounters +- Added Docker image (thanks to Arthur Semenyutin for the script, see README for details) + ## [0.49.16](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.49.16) (2022-08-15) - Fixed `async let` indenting regression (broken in 0.49.15) @@ -384,7 +391,7 @@ ## [0.47.3](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.3) (2020-11-09) - Fixed bug with `extensionAccessControl` increasing extension access level beyond extended type -- Fixed regression with non-standard `.swift-version` contents being flagged as an error +- Fixed regression with non-standard .swift-version contents being flagged as an error - Fixed bug in `hoistPatternLet` rule when using `--patternlet inline` - Fixed case where `enumNamespaces` was incorrectly applied - Fixed indenting of wrapped line starting with a closing paren or brace @@ -395,7 +402,7 @@ ## [0.47.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.2) (2020-10-30) - The `markTypes`, `organizeDeclarations` and`extensionAccessControl` rules now respect comment directives -- Errors in `.swiftformat` config files no longer fail silently +- Errors in .swiftformat config files no longer fail silently - Fixed bug in `--modifierorder` config and added support for SwiftLint modifierorder syntax - Fixed issue where `hoistPatternLet` breaks compilation due to a quirk in Swift parser - Fixed bug in `hoistPatternLet` when expression is wrapped or contains spaces @@ -471,7 +478,7 @@ ## [0.45.5](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.5) (2020-08-09) -- Fixed `.swiftformat` configuration file processing when using `--stdinpath` option +- Fixed .swiftformat configuration file processing when using `--stdinpath` option - Fixed bug where conditional imports could be mangled by `sortedImports` rule - Fixed indenting of braces after throwing function with wrapped return type - Fixed indenting of wrapped `in` keyword inside closure @@ -887,7 +894,7 @@ - Relative indentation is now preserved inside multiline comment blocks - Fixed indenting of `switch` cases using Swift 5's new `@unknown` attribute - Fixed some errors in documentation and warning messages -- The `.swift-version` file parser now permits cases like `3.0-PREVIEW-4` +- The .swift-version file parser now permits cases like `3.0-PREVIEW-4` - Fixed the performance test target, which was broken in Xcode 10.1 ## [0.39.4](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.39.4) (2019-03-03) @@ -902,7 +909,7 @@ - Fixed a bug with `hoistPatternLet` rule for switch cases without a space - Fixed a bug in the `typeSugar` rule when referencing nested types -- The `.swiftformat` configuration file type is now associated with the SwiftFormat for Xcode app +- The .swiftformat configuration file type is now associated with the SwiftFormat for Xcode app ## [0.39.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.39.2) (2019-02-14) diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index f07b77b7..0fed01ae 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/README.md b/README.md index cb022d7e..f621ed40 100644 --- a/README.md +++ b/README.md @@ -878,6 +878,7 @@ Credits * [Jim Puls](https://github.com/puls) - Big Sur icon update * [Daniele Formichelli](https://github.com/danyf90) - JSON reporter * [Mahdi Bchatnia](https://github.com/inket) - Linux build workflow +* [Arthur Semenyutin](https://github.com/vox-humana) - Docker image * [Nick Lockwood](https://github.com/nicklockwood) - Everything else ([Full list of contributors](https://github.com/nicklockwood/SwiftFormat/graphs/contributors)) diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index f4c6803f..a68a0bf6 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.49.16 +// Version 0.49.17 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index fd185a33..3095c90b 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -let swiftFormatVersion = "0.49.16" +let swiftFormatVersion = "0.49.17" public let version = swiftFormatVersion /// The standard SwiftFormat config file name diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 5693d219..cf03e978 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.49.16 +// Version 0.49.17 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index 8ef86648..a038264c 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.49.16", + "version": "0.49.17", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.49.16" + "tag": "0.49.17" }, "default_subspecs": "Core", "subspecs": [ diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj index 407faab2..96c8dad2 100644 --- a/SwiftFormat.xcodeproj/project.pbxproj +++ b/SwiftFormat.xcodeproj/project.pbxproj @@ -1080,7 +1080,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1108,7 +1108,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1204,7 +1204,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode"; PRODUCT_NAME = "SwiftFormat for Xcode"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1234,7 +1234,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode"; PRODUCT_NAME = "SwiftFormat for Xcode"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1262,7 +1262,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension"; PRODUCT_NAME = SwiftFormat; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1292,7 +1292,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 0.49.16; + MARKETING_VERSION = 0.49.17; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension"; PRODUCT_NAME = SwiftFormat; PROVISIONING_PROFILE_SPECIFIER = "";