Updated for 0.45.0 release

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## [0.45.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.0) (2020-07-29)
+
+- Added `wrapAttributes` rule for controlling attribute position
+- Added `wrapMultilineConditionalBraces` rule for opening braces for wrapped expressions
+- Added `preferKeyPath` rule for converting trivial closures to keyPaths in Swift 5.2
+- Added `--smarttabs` option to support consistent indenting regardless of `--tabwidth`
+- Updated Xcode extension for Xcode 12 and macOS Big Sur
+- Added Swift version dropdown to SwiftFormat for Xcode configuration app
+- Added `--guardelse` option to control wrapping of `else` clauses in `guard` statements
+- Allman braces are now applied to closure braces, which were previously ignored
+- The `void` rule now converts `Void()` literals to just `()`
+- Improved indenting of closing parentheses and brackets
+- Renamed `--empty` option to `--voidtype`, which better describes its function
+- Renamed `specifiers` rule to `modifierOrder` for consistency with SwiftLint
+- Renamed `--specifierorder` configuration option to `--modifierorder`
+- Fixed bug where `--verbose` mode didn't log path for unchanged files
+- Improved documentation of `numberFormatting` configuration options
+- Added Sublime Text plugin instructions
+
 ## [0.44.17](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.17) (2020-07-12)
 
 - The `wrapArguments` rule now keeps internal and external parameter labels on the same line

EditorExtension/Application/Source/FreeTextTableCellView.swift

@@ -68,7 +68,8 @@ class FreeTextTableCellView: NSTableCellView {
 extension FreeTextTableCellView: NSTextFieldDelegate {
     override func controlTextDidChange(_ obj: Notification) {
         guard let textView: NSTextView = obj.userInfo!["NSFieldEditor"] as? NSTextView,
-            let freeText = objectValue as? UserSelectionFreeText else {
+            let freeText = objectValue as? UserSelectionFreeText
+        else {
             return
         }
         freeText.selection = textView.string

EditorExtension/Extension/Info.plist

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

EditorExtension/Extension/XCSourceTextBuffer+SwiftFormat.swift

@@ -35,7 +35,8 @@ extension XCSourceTextBuffer {
     }
 
     func newPosition(for position: XCSourceTextPosition,
-                     in tokens: [Token]) -> XCSourceTextPosition {
+                     in tokens: [Token]) -> XCSourceTextPosition
+    {
         let offset = newOffset(for: SourceOffset(position), in: tokens, tabWidth: tabWidth)
         return XCSourceTextPosition(offset)
     }

EditorExtension/Shared/OptionsStore.swift

@@ -182,7 +182,8 @@ extension OptionsStore {
 
     private func load() -> OptionStoreRepresentation {
         guard let options = store
-            .value(forKey: optionsKey) as? OptionStoreRepresentation else {
+            .value(forKey: optionsKey) as? OptionStoreRepresentation
+        else {
             return OptionStoreRepresentation()
         }
         return options

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

@@ -36,27 +36,27 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.44.17</string>
+	<string>0.45.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11C504</string>
+	<string>11E608c</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19B90</string>
+	<string>19E258</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1130</string>
+	<string>1150</string>
 	<key>DTXcodeBuild</key>
-	<string>11C504</string>
+	<string>11E608c</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/Resources/version.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildAliasOf</key>
+	<string>IDEFrameworks</string>
+	<key>BuildVersion</key>
+	<string>62</string>
+	<key>CFBundleShortVersionString</key>
+	<string>11.5</string>
+	<key>CFBundleVersion</key>
+	<string>16139</string>
+	<key>ProductBuildVersion</key>
+	<string>11E608c</string>
+	<key>ProjectName</key>
+	<string>IDEFrameworks</string>
+	<key>SourceVersion</key>
+	<string>16139000000000000</string>
+</dict>
+</plist>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/_CodeSignature/CodeResources

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		zzlORN2gCjS+IPwWe/jB815bL1c=
+		</data>
+		<key>Resources/version.plist</key>
+		<data>
+		1HqdJeZmAcc4BRvUFNIx9snpVWQ=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Q8AhlJ0t1VwzrlJoaw/OYBGk6DNnGK75DBVh9m/C2Fg=
+			</data>
+		</dict>
+		<key>Resources/version.plist</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			3pv/8F4/lRQVjQa8UK+PdH+xNCWLzQbK9B0FTyoQBRA=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/Current

@@ -0,0 +1 @@
+A

EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/XcodeKit

@@ -0,0 +1 @@
+Versions/Current/XcodeKit

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.44.17</string>
+	<string>0.45.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11C504</string>
+	<string>11E608c</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19B90</string>
+	<string>19E258</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1130</string>
+	<string>1150</string>
 	<key>DTXcodeBuild</key>
-	<string>11C504</string>
+	<string>11E608c</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>NSExtension</key>

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

@@ -5,7 +5,17 @@
 	<key>files</key>
 	<dict/>
 	<key>files2</key>
-	<dict/>
+	<dict>
+		<key>Frameworks/XcodeKit.framework</key>
+		<dict>
+			<key>cdhash</key>
+			<data>
+			yqBXZ9u1Abh1i3rpdut+YHxtCI4=
+			</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>
+		</dict>
+	</dict>
 	<key>rules</key>
 	<dict>
 		<key>^Resources/</key>