diff --git a/CHANGELOG.md b/CHANGELOG.md
index c639afc6e..86f6d8e0f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# Change Log
+## [0.44.8](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.8) (2020-05-01)
+
+- Fixed a significant performance regression introduced in 0.44.6
+- Changed ordering of `override` keyword in specifier lists to match SwiftLint
+- Fixed timeout due to infinite recursion when formatting nested comments
+- The `trailingSpace` rule is now called before `indent` to avoid noise when linting
+- Fixed bug where `unusedArguments` rule ignored all arguments if any was already ignored
+- Fixed `redundantParens` rule breaking closure argument lists where argument is named `self`
+- Fixed indenting of multiline string interpolations
+- Fixed broken formatting of multiline string interpolations
+- Fixed crash in `wrap` rule
+- The `wrap` rule now favors wrapping function args over wrapping at `.` operator
+- Fixed a bug with indenting of pre-formatted multiline comments
+- Fixed a misleading error message relating to `--tabwidth` option
+
## [0.44.7](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.44.7) (2020-04-04)
- Fixed indenting of wrapped closures after a switch statement
diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
index 34053587c..23726b593 100755
Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ
diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist
index 3ccc3251c..f30bad92f 100644
--- a/EditorExtension/Application/Info.plist
+++ b/EditorExtension/Application/Info.plist
@@ -32,7 +32,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
LSApplicationCategoryType
diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist
index 8decaa950..ce227d913 100644
--- a/EditorExtension/Extension/Info.plist
+++ b/EditorExtension/Extension/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
LSMinimumSystemVersion
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources
index 5e4f4c375..4835c2c8c 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources and b/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib
index bcfee37d8..35c7b0f06 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib
index be2a8f863..93ff0acba 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreFoundation.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib
index fb90d8629..21564e420 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreGraphics.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib
index 4b23920c6..fc7c5e308 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDarwin.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib
index c7b6376ac..4bb57303e 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftDispatch.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib
index 6596275ac..81641fb0a 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftFoundation.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib
index 477476777..f2fcf71ba 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftIOKit.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib
index dc8d4ba1a..2314e030f 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftObjectiveC.dylib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
index 18d4ef059..0df1803a4 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist
@@ -32,7 +32,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleSupportedPlatforms
MacOSX
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode
index 996964f04..ffe8c0c93 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode and b/EditorExtension/SwiftFormat for Xcode.app/Contents/MacOS/SwiftFormat for Xcode differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
index 5c29332ac..197fcb10e 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleSupportedPlatforms
MacOSX
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat
index 965780981..39fc42f92 100755
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat and b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/MacOS/SwiftFormat differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
index c05f41786..a7e35d1c0 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist
index d805327a3..028105701 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib
index 82a393840..9cf43a377 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
index 9a4316705..d4b99911c 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
index 6ac5425f7..e1f0bce54 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
index 5556066ac..1e68bac1b 100644
Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/RulesViewController.nib differ
diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
index 637c08bbf..8cd14e18f 100644
--- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
+++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources
@@ -6,27 +6,27 @@
Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib
- 0+Ic/JrklekAHuXBOUlXwwlshxc=
+ /LPPBD2TaTTWRPaGIbur8f6GHMc=
Resources/Base.lproj/Main.storyboardc/Info.plist
- 10GjG/hz1UADVI3KC9unI3H7ZKA=
+ bYNWQdfZlsuQVei0quX7Z0tlbGk=
Resources/Base.lproj/Main.storyboardc/MainMenu.nib
- E4c5h5rYCdnHZfVIVsm8BwXA3so=
+ a3GoEO4og3oMMc6t3FHolvH/RL0=
Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
- KylasFg+si3UUm8eXJoPWVEUwrc=
+ sC6yADeMn8z69biMShwXP7dinR0=
Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
- 3ROXh/G32wj36+W3uI5u+rUwt6E=
+ a/T3pOz7A69s1S8UFVZAvAj3VRo=
Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
- la7UnF6jV1BiDGphsXMpYaXZ4O8=
+ 5MDR2/9wrKqUzNvn+WP51hkOrJI=
Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib
@@ -111,7 +111,7 @@
cdhash
- 0A+BUbVPYQ9DgaQ+egRsj5TFBJg=
+ jBv1R4NCn9CayIdTlayEXFTueq0=
requirement
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")
@@ -120,66 +120,66 @@
hash
- 0+Ic/JrklekAHuXBOUlXwwlshxc=
+ /LPPBD2TaTTWRPaGIbur8f6GHMc=
hash2
- zspdSQiPsiN05B775wawpX3kNuvEmFI5q59rnfLrTUc=
+ Z9gPo2BwEgPlEJgC8UqW8TlMAMrkbMmBZxrbpmmCeyk=
Resources/Base.lproj/Main.storyboardc/Info.plist
hash
- 10GjG/hz1UADVI3KC9unI3H7ZKA=
+ bYNWQdfZlsuQVei0quX7Z0tlbGk=
hash2
- LmZxI47f+CYGfYriJc2KW1M0g/Y2RtoUl2uyJg47KBA=
+ b5Dxy9D/F3N+hV/h7SD19EEAMWyUfJITX/a5x0rgZbw=
Resources/Base.lproj/Main.storyboardc/MainMenu.nib
hash
- E4c5h5rYCdnHZfVIVsm8BwXA3so=
+ a3GoEO4og3oMMc6t3FHolvH/RL0=
hash2
- HxhuevRSE1JoTWZ6ExJXE7Xe99fbUfRtZ8d+sKmei04=
+ DjbQ+VAtbRLatvwVntXFeTb7pec/A7vBrk+VdIsjg+o=
Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib
hash
- KylasFg+si3UUm8eXJoPWVEUwrc=
+ sC6yADeMn8z69biMShwXP7dinR0=
hash2
- SZuwJPf5/0CEtS1FiIfRaKD5R6ToOA238Tkti9WYY9Y=
+ OP3+E3TNbhYfkILa3q2OZsN91H8dHZiO1+UHzfr1Edo=
Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib
hash
- 3ROXh/G32wj36+W3uI5u+rUwt6E=
+ a/T3pOz7A69s1S8UFVZAvAj3VRo=
hash2
- OV/VjQjuyF5DA8wNl7+Jt/Muc9//DSkaP+1NT/MKsLo=
+ tXzHZKCdnq2UOMHNXXUfFtmrAQveWFOiT0aAUSWZMH0=
Resources/Base.lproj/Main.storyboardc/RulesViewController.nib
hash
- la7UnF6jV1BiDGphsXMpYaXZ4O8=
+ 5MDR2/9wrKqUzNvn+WP51hkOrJI=
hash2
- BCoGlIOIU0sScg7JKViK4Lip2YzVshUdLUR6GvWJxxU=
+ dbAO4KkrJ0cCw7KPdQ1L1E9UA11qs4Hja8pJDjEBlLA=
Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib
diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift
index 44de5fbf4..9c930a918 100644
--- a/Sources/Formatter.swift
+++ b/Sources/Formatter.swift
@@ -2,7 +2,7 @@
// Formatter.swift
// SwiftFormat
//
-// Version 0.44.7
+// Version 0.44.8
//
// Created by Nick Lockwood on 12/08/2016.
// Copyright 2016 Nick Lockwood
diff --git a/Sources/Info.plist b/Sources/Info.plist
index 8e28e6e00..6d5dca748 100644
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleSignature
????
CFBundleVersion
diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
index 0cd806390..3e9fc59de 100644
--- a/Sources/SwiftFormat.swift
+++ b/Sources/SwiftFormat.swift
@@ -32,7 +32,7 @@
import Foundation
/// The current SwiftFormat version
-public let version = "0.44.7"
+public let version = "0.44.8"
/// The standard SwiftFormat config file name
public let swiftFormatConfigurationFile = ".swiftformat"
diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
index e599cac88..47ef8d7cb 100644
--- a/Sources/Tokenizer.swift
+++ b/Sources/Tokenizer.swift
@@ -2,7 +2,7 @@
// Tokenizer.swift
// SwiftFormat
//
-// Version 0.44.7
+// Version 0.44.8
//
// Created by Nick Lockwood on 11/08/2016.
// Copyright 2016 Nick Lockwood
diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json
index 4cb6d300a..63091396d 100644
--- a/SwiftFormat.podspec.json
+++ b/SwiftFormat.podspec.json
@@ -1,6 +1,6 @@
{
"name": "SwiftFormat",
- "version": "0.44.7",
+ "version": "0.44.8",
"license": {
"type": "MIT",
"file": "LICENSE.md"
@@ -10,7 +10,7 @@
"authors": "Nick Lockwood",
"source": {
"git": "https://github.com/nicklockwood/SwiftFormat.git",
- "tag": "0.44.7"
+ "tag": "0.44.8"
},
"default_subspecs": "Core",
"subspecs": [
diff --git a/Tests/Info.plist b/Tests/Info.plist
index e883d0802..24c2db896 100644
--- a/Tests/Info.plist
+++ b/Tests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 0.44.7
+ 0.44.8
CFBundleSignature
????
CFBundleVersion