Updated for 0.40.1 release

nicklockwood · Mar 16, 2019 · 8df6d1f · 8df6d1f
1 parent d8a4ae0
commit 8df6d1f
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.40.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.40.1) (2019-03-16)
+
+- Fixed bug where `--trailingclosures` would incorrectly remove parentheses before an opening brace
+- Fixed SwiftFormat for Xcode appearance when running in dark mode on macOS 10.14 (Mojave)
+
 ## [0.40.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.40.0) (2019-03-14)
 
 - Added `--trailingclosures` option for whitelisting functions that should use trailing closure syntax

diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist
@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.40.0</string>
+	<string>0.40.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/EditorExtension/Application/Source/RulesViewController.swift b/EditorExtension/Application/Source/RulesViewController.swift
@@ -201,7 +201,7 @@ extension RulesViewController: NSTableViewDelegate {
         return tableView.makeView(withIdentifier: id, owner: self)
     }
 
-    func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
+    func tableView(_ tableView: NSTableView, rowViewForRow _: Int) -> NSTableRowView? {
         if let rowView = tableView.makeView(withIdentifier: .ruleRowView, owner: self) as? NSTableRowView {
             return rowView
         }
@@ -211,8 +211,8 @@ extension RulesViewController: NSTableViewDelegate {
         return rowView
     }
 
-    func tableView(_ tableView: NSTableView, didAdd rowView: NSTableRowView, forRow row: Int) {
-        switch self.model(forRow: row) {
+    func tableView(_: NSTableView, didAdd rowView: NSTableRowView, forRow row: Int) {
+        switch model(forRow: row) {
         case .binary:
             rowView.backgroundColor = NSColor.controlAlternatingRowBackgroundColors[1]
         case .list, .freeText:
@@ -224,5 +224,3 @@ extension RulesViewController: NSTableViewDelegate {
 private extension NSUserInterfaceItemIdentifier {
     static let ruleRowView = NSUserInterfaceItemIdentifier(rawValue: "RuleRowView")
 }
-
-
diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.40.0</string>
+	<string>0.40.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.40.0</string>
+	<string>0.40.1</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/...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.40.0</string>
+	<string>0.40.1</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/...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
@@ -6,27 +6,27 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		u4vEDh8epEK5Xs9pO0IHXjkLo+0=
+		g0JIA90MmyrtQJc/t73sv6AeYZc=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		BLKpc5YKNxtfFAkk/yuEL+ef0VE=
+		OZQFVCixmeOm29SeiAj3uy9m3Qc=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		V0q3O0kWQH5upcH14/N7oSEUiZQ=
+		0a+5qtwQeuagJEX6ORTvuG8i+ZE=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		+NmGgDatmhXJgXeak4nibJgU47c=
+		C8g3mmyA2MPMEaKlo0qhHuCrIkA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		5OXFQrYDgQAwBX7o+xnPoUXvkmE=
+		ycworNa57nfN3AJa5Gnt9isHB4s=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		qlqMKaVVOg12pBE9C5WYMIATkPU=
+		8gRAYR12vLWt5FhYkZ+JBV2E42g=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
@@ -178,7 +178,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			hIBVQKitdwGl5MLs0esbnsxGNtE=
+			LFo6X4uiyQ2sKl6m+W0REemWAYY=
 			</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>
@@ -187,66 +187,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			u4vEDh8epEK5Xs9pO0IHXjkLo+0=
+			g0JIA90MmyrtQJc/t73sv6AeYZc=
 			</data>
 			<key>hash2</key>
 			<data>
-			1iq3aVEzldlu58kNDzixl0wRFJvRUjFFI4NxKCfmCR4=
+			e3M4p8POJ0k4JdYukRgpIBfjIz4uIA6Kb0yCceNFYQU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			BLKpc5YKNxtfFAkk/yuEL+ef0VE=
+			OZQFVCixmeOm29SeiAj3uy9m3Qc=
 			</data>
 			<key>hash2</key>
 			<data>
-			nibw/0KY/znqe7c3sIodZM+9rJFTpTqDoW08l/ns+9g=
+			GdQC3EO0WwjMkn2DFFYWJlXAapzI8Wpq3KSNxM2lSfU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			V0q3O0kWQH5upcH14/N7oSEUiZQ=
+			0a+5qtwQeuagJEX6ORTvuG8i+ZE=
 			</data>
 			<key>hash2</key>
 			<data>
-			Enjxn5KkmtVa6wZVjfVwXCxNMzefnNe0PHUyLDEsmRE=
+			YJOE5m6okaq9aUtvH8AxN7ZvAxyNaM685+FaaeOlvZw=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			+NmGgDatmhXJgXeak4nibJgU47c=
+			C8g3mmyA2MPMEaKlo0qhHuCrIkA=
 			</data>
 			<key>hash2</key>
 			<data>
-			tkNu5WxL/lxV8POOtM8b2N5Y/KHkPfAiBSzhrEvwxeo=
+			PwBwrLJp58IPcnR/0QNeddCMvgVFw72zUqxxAAHdXS8=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			5OXFQrYDgQAwBX7o+xnPoUXvkmE=
+			ycworNa57nfN3AJa5Gnt9isHB4s=
 			</data>
 			<key>hash2</key>
 			<data>
-			2qmjvLuG86WycFbTrjfVTOZCu69SsljzOBJ6aFxyghA=
+			MRph3xAAKYbNf0jTY5MJNfhfqi7Ul1i5CDQSGX8efUU=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			qlqMKaVVOg12pBE9C5WYMIATkPU=
+			8gRAYR12vLWt5FhYkZ+JBV2E42g=
 			</data>
 			<key>hash2</key>
 			<data>
-			Z+/9r6a0y9DN3CXyBtPYB7Dloz9fYqayE/VbHvmpxQs=
+			Vn2+LxaLEP9HJnGxZgG6ehNH9RzurxaFz4nNfZw8M6U=
 			</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.40.0
+//  Version 0.40.1
 //
 //  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.40.0</string>
+	<string>0.40.1</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
-public let version = "0.40.0"
+public let version = "0.40.1"
 
 /// The standard SwiftFormat config file name
 public let swiftFormatConfigurationFile = ".swiftformat"

diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
@@ -2,7 +2,7 @@
 //  Tokenizer.swift
 //  SwiftFormat
 //
-//  Version 0.40.0
+//  Version 0.40.1
 //
 //  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.40.0",
+  "version": "0.40.1",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/SwiftFormat.git",
-    "tag": "0.40.0"
+    "tag": "0.40.1"
   },
   "default_subspecs": "Core",
   "subspecs": [

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.40.0</string>
+	<string>0.40.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>