Updated for 0.45.1 release

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.45.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.1) (2020-07-30)
+
+- Fixed bug where `preferKeyPath` was incorrectly applied to function calls and compound expressions
+- The `wrapMultilineStatementBraces` rule is now applied to `init` and `subscript` braces
+- The `wrapAttributes` rule now handles `init` and `subscript` the same way as functions
+
 ## [0.45.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.0) (2020-07-29)
 
 - Added `wrapAttributes` rule for controlling attribute position

EditorExtension/Extension/Info.plist

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

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

@@ -36,13 +36,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.45.0</string>
+	<string>0.45.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

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.45.0</string>
+	<string>0.45.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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

@@ -10,10 +10,10 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			yqBXZ9u1Abh1i3rpdut+YHxtCI4=
+			H1noZw94n2HZjiZgaGZ51xxt7ts=
 			</data>
 			<key>requirement</key>
-			<string>anchor apple generic and identifier "com.apple.dt.XcodeKit" 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>
+			<string>identifier "com.apple.dt.XcodeKit" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
 		</dict>
 	</dict>
 	<key>rules</key>

Sources/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.45.0
+//  Version 0.45.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood
@@ -109,7 +109,8 @@ public class Formatter: NSObject {
 
     /// Create a new formatter instance from a token array
     public init(_ tokens: [Token], options: FormatOptions = FormatOptions(),
-                trackChanges: Bool = false, range: Range<Int>? = nil) {
+                trackChanges: Bool = false, range: Range<Int>? = nil)
+    {
         self.tokens = tokens
         self.options = options
         self.trackChanges = trackChanges

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.45.0</string>
+	<string>0.45.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/Options.swift

@@ -364,7 +364,8 @@ public struct FormatOptions: CustomStringConvertible {
                 fragment: Bool = false,
                 ignoreConflictMarkers: Bool = false,
                 swiftVersion: Version = .undefined,
-                fileInfo: FileInfo = FileInfo()) {
+                fileInfo: FileInfo = FileInfo())
+    {
         self.indent = indent
         self.linebreak = linebreak
         self.allowInlineSemicolons = allowInlineSemicolons
@@ -451,7 +452,8 @@ public struct FileOptions {
                 supportedFileExtensions: [String] = ["swift"],
                 excludedGlobs: [Glob] = [],
                 unexcludedGlobs: [Glob] = [],
-                minVersion: Version = .undefined) {
+                minVersion: Version = .undefined)
+    {
         self.followSymlinks = followSymlinks
         self.supportedFileExtensions = supportedFileExtensions
         self.excludedGlobs = excludedGlobs
@@ -474,7 +476,8 @@ public struct Options {
 
     public init(fileOptions: FileOptions? = nil,
                 formatOptions: FormatOptions? = nil,
-                rules: Set<String>? = nil) {
+                rules: Set<String>? = nil)
+    {
         self.fileOptions = fileOptions
         self.formatOptions = formatOptions
         self.rules = rules

Sources/OptionsDescriptor.swift

@@ -86,7 +86,8 @@ extension FormatOptions {
              help: String,
              keyPath: WritableKeyPath<FormatOptions, Bool>,
              trueValues: [String],
-             falseValues: [String]) {
+             falseValues: [String])
+        {
             assert(argumentName.count <= Options.maxArgumentNameLength)
             self.argumentName = argumentName
             self.propertyName = propertyName
@@ -114,7 +115,8 @@ extension FormatOptions {
                 help: String,
                 keyPath: WritableKeyPath<FormatOptions, T>,
                 fromArgument: @escaping (String) -> T?,
-                toArgument: @escaping (T) -> String) {
+                toArgument: @escaping (T) -> String)
+        {
             self.argumentName = argumentName
             self.propertyName = propertyName
             self.displayName = displayName
@@ -136,7 +138,8 @@ extension FormatOptions {
              displayName: String,
              help: String,
              keyPath: WritableKeyPath<FormatOptions, String>,
-             options: DictionaryLiteral<String, String>) {
+             options: DictionaryLiteral<String, String>)
+        {
             let map: [String: String] = Dictionary(options.map { ($0, $1) }, uniquingKeysWith: { $1 })
             let keys = Array(map.keys)
             self.init(argumentName: argumentName,
@@ -162,7 +165,8 @@ extension FormatOptions {
                                   propertyName: String,
                                   displayName: String,
                                   help: String = "",
-                                  keyPath: WritableKeyPath<FormatOptions, T>) where T.RawValue == String {
+                                  keyPath: WritableKeyPath<FormatOptions, T>) where T.RawValue == String
+        {
             self.argumentName = argumentName
             self.propertyName = propertyName
             self.displayName = displayName
@@ -184,7 +188,8 @@ extension FormatOptions {
                                   displayName: String,
                                   help: String = "",
                                   keyPath: WritableKeyPath<FormatOptions, T>,
-                                  options: [String]) where T.RawValue == String {
+                                  options: [String]) where T.RawValue == String
+        {
             self.init(
                 argumentName: argumentName,
                 propertyName: propertyName,
@@ -200,7 +205,8 @@ extension FormatOptions {
              displayName: String,
              help: String,
              keyPath: WritableKeyPath<FormatOptions, [String]>,
-             validate: @escaping (String) throws -> Void = { _ in }) {
+             validate: @escaping (String) throws -> Void = { _ in })
+        {
             self.argumentName = argumentName
             self.propertyName = propertyName
             self.displayName = displayName
@@ -226,7 +232,8 @@ extension FormatOptions {
              displayName: String,
              help: String,
              keyPath: WritableKeyPath<FormatOptions, Set<String>>,
-             validate: @escaping (String) throws -> Void = { _ in }) {
+             validate: @escaping (String) throws -> Void = { _ in })
+        {
             self.argumentName = argumentName
             self.propertyName = propertyName
             self.displayName = displayName

Sources/Rules.swift

@@ -52,7 +52,8 @@ public final class FormatRule: Equatable, Comparable {
                      orderAfter: [String] = [],
                      options: [String] = [],
                      sharedOptions: [String] = [],
-                     _ fn: @escaping (Formatter) -> Void) {
+                     _ fn: @escaping (Formatter) -> Void)
+    {
         self.fn = fn
         self.help = help
         self.orderAfter = orderAfter

Sources/SwiftFormat.swift

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

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

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

SwiftFormat.xcodeproj/project.pbxproj

@@ -1178,7 +1178,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.45.0;
+				MARKETING_VERSION = 0.45.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1205,7 +1205,7 @@
 				INFOPLIST_FILE = EditorExtension/Application/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 0.45.0;
+				MARKETING_VERSION = 0.45.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
 				PRODUCT_NAME = "SwiftFormat for Xcode";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.45.0</string>
+	<string>0.45.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Tests/RulesTests.swift

@@ -12409,4 +12409,10 @@ class RulesTests: XCTestCase {
         let options = FormatOptions(swiftVersion: "5.2")
         testFormatting(for: input, rule: FormatRules.preferKeyPath, options: options)
     }
+
+    func testNoMapPropertyToKeyPathForOptionalChaining() {
+        let input = "let foo = bar.map { $0?.foo }"
+        let options = FormatOptions(swiftVersion: "5.2")
+        testFormatting(for: input, rule: FormatRules.preferKeyPath, options: options)
+    }
 }

Tests/XCTestManifests.swift

@@ -998,6 +998,7 @@ extension RulesTests {
         ("testNoMangleYodaConditionInTernary3", testNoMangleYodaConditionInTernary3),
         ("testNoMapPropertyToKeyPathForCompoundExpressions", testNoMapPropertyToKeyPathForCompoundExpressions),
         ("testNoMapPropertyToKeyPathForFunctionCalls", testNoMapPropertyToKeyPathForFunctionCalls),
+        ("testNoMapPropertyToKeyPathForOptionalChaining", testNoMapPropertyToKeyPathForOptionalChaining),
         ("testNoMapPropertyToKeyPathForSwiftLessThan5_2", testNoMapPropertyToKeyPathForSwiftLessThan5_2),
         ("testNoMapSelfToKeyPath", testNoMapSelfToKeyPath),
         ("testNoMarkFunctionArgument", testNoMarkFunctionArgument),