diff --git a/CHANGELOG.md b/CHANGELOG.md index aea878ed..1449d572 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## [0.28.0](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.28.0) (2017-03-24) + +- Added `--self insert` option to optionally insert `self` when accessing member variables/functions +- The `--self` and `--stripunusedargs` arguments can now be inferred automatically using `--inferoptions` +- SwiftFormat now detects and rejects source files that contain merge conflict markers +- Added `--conflictmarkers` option to optionally ignore conflict markers (e.g. if they clash with a custom operator) +- The `redundantSelf` rule now correctly strips `self` from computed var setters and getters +- The `redundantSelf` rule now handles static and class variables/functions correctly +- Fixed a potential bug where command-line tool might get stuck in an infinite loop +- Fixed a bug where a invalid source code could causes variables to be incorrectly removed +- Fixed some bugs in error reporting + ## [0.27.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.27.1) (2017-03-21) - Fixed trailing space that was incorrectly added to blank lines when `redundantSelf` rule is disabled diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index 6cee81b9..0e1137e5 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/EditorExtension/Application/Info.plist b/EditorExtension/Application/Info.plist index 5856159e..6e6ff039 100644 --- a/EditorExtension/Application/Info.plist +++ b/EditorExtension/Application/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.27.1 + 0.28.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist index 3848eb41..d91d352a 100644 --- a/EditorExtension/Extension/Info.plist +++ b/EditorExtension/Extension/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.27.1 + 0.28.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib index 8dbd0af7..92dfe053 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftAppKit.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCore.dylib index 70b48818..15e7ccd5 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/libswiftCoreData.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib index 325c8c76..15d5fdec 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreData.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 4a8e59b7..512bf854 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/libswiftCoreImage.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib index fa3e89e1..b488e9c0 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftCoreImage.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 9a7ad0a5..88d9eb29 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 feb3794c..232130f5 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 1823f847..6bf90496 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 5fd0fe36..313e3770 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 75db80f2..555bfe2f 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/Frameworks/libswiftQuartzCore.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib index 8902b92c..f1f90381 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftQuartzCore.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib index 82b366ea..c52c7d2c 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Frameworks/libswiftXPC.dylib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist index 8b703b94..f09d481d 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.27.1 + 0.28.0 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 4657b6fb..a5177b3b 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 f2521253..20a2f32d 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.27.1 + 0.28.0 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 ae067474..2e5e7b6e 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/Info.plist b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist index 610f5c7d..0c998cbf 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 11052236..deb5b91f 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/NSWindowController-B8D-0N-5wS.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib index 0524975e..54561be6 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/ViewController.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/ViewController.nib index 53ee08ab..4227b4c0 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/ViewController.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/ViewController.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib index 8d9dd9f6..816642e4 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib differ diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources index f5edea58..b41b5b03 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources @@ -6,23 +6,23 @@ Resources/Base.lproj/Main.storyboardc/Info.plist - eNaly/5P+KLw0dfstobWxRkPh8c= + +75vChTbjRm/SxV/VaA4uuljvx0= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - rtKrk+t2hr/PnY5Xz62kkJIZEUQ= + bBfU/g+Z8f4IhcfX69F+IpCHT3Q= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - yKusWdyUSEkt1u4NLbUNk+aY7b4= + uvMLqv6MY/Ja8FwiKd1hsag+VSw= Resources/Base.lproj/Main.storyboardc/ViewController.nib - UuJzVOrd/BiUzomMHHBqevNueLs= + Yf8MD14bmnHP8mpmeky63qTPU+8= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib - o4Ww08nonoSrrNGDHECY+IvT0NQ= + pZOBKEL92YKzg3ZYm2sSDKh9x2s= Resources/libswiftRemoteMirror.dylib @@ -143,7 +143,7 @@ cdhash - 9QmJeIj9FnkQ8WsMYYadH90PjBQ= + FOpkuzGrUk4jADwq59HkMQvMHYA= requirement identifier "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Nick Lockwood (XDQ4XJZXHD)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */ @@ -152,55 +152,55 @@ hash - eNaly/5P+KLw0dfstobWxRkPh8c= + +75vChTbjRm/SxV/VaA4uuljvx0= hash2 - XexXaQC8giLSWKXQblE3A1Jp0dRfqEcc/A15ntSucIE= + GYeKxhpF0lw2kTvYiRn3WzmUbnoaU1qAiFHLYb2gmoY= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash - rtKrk+t2hr/PnY5Xz62kkJIZEUQ= + bBfU/g+Z8f4IhcfX69F+IpCHT3Q= hash2 - XxkCGSKS3i4Djuk2GioySPbgs5InnCxWuv2QUoYzys0= + 3yBdhfagGB+moJPL/M5vwGOej79DTc2fNWDt7qN/uPk= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib hash - yKusWdyUSEkt1u4NLbUNk+aY7b4= + uvMLqv6MY/Ja8FwiKd1hsag+VSw= hash2 - xA51IzPLkrFb2djd1j+oSe4vYZUZdH4KG9+cpJUH8Us= + vTN288jp+IaIPNygxmngMHz/PjfCKuEI3Nt+ZYWgdWQ= Resources/Base.lproj/Main.storyboardc/ViewController.nib hash - UuJzVOrd/BiUzomMHHBqevNueLs= + Yf8MD14bmnHP8mpmeky63qTPU+8= hash2 - 7BRZ1Hzx/QThlYqNWzxMWvYuKDHchZLSrGmfJ1hOoZQ= + T7JYV2CLhJR+K/I7NhJh56HznEd5n6TX9/EBJfrCiwI= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib hash - o4Ww08nonoSrrNGDHECY+IvT0NQ= + pZOBKEL92YKzg3ZYm2sSDKh9x2s= hash2 - Z53y6hNofC9a/Hdrr0iJpgQXXzwc5oGgvguGD3HA32w= + wJ9uEVwzRueumviMFTDGh2/LnXWxxj5rldcWR67W0vs= Resources/libswiftRemoteMirror.dylib diff --git a/Sources/Info.plist b/Sources/Info.plist index 854c9fd5..b6a89105 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.27.1 + 0.28.0 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index cf60bb51..0b553f5e 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -public let version = "0.27.1" +public let version = "0.28.0" /// An enumeration of the types of error that may be thrown by SwiftFormat public enum FormatError: Error, CustomStringConvertible { diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index ec8c43ce..5ba1f24e 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.27.1", + "version": "0.28.0", "license": { "type": "zlib", "file": "LICENCE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.27.1" + "tag": "0.28.0" }, "default_subspecs": "Core", "subspecs": [ diff --git a/SwiftFormat.xcodeproj/xcshareddata/xcbaselines/015AF2B61DC6A538008F0A8C.xcbaseline/1F44D368-293A-49E8-B611-DF6CA453D87D.plist b/SwiftFormat.xcodeproj/xcshareddata/xcbaselines/015AF2B61DC6A538008F0A8C.xcbaseline/1F44D368-293A-49E8-B611-DF6CA453D87D.plist index 9b480a7c..4ddebc91 100644 --- a/SwiftFormat.xcodeproj/xcshareddata/xcbaselines/015AF2B61DC6A538008F0A8C.xcbaseline/1F44D368-293A-49E8-B611-DF6CA453D87D.plist +++ b/SwiftFormat.xcodeproj/xcshareddata/xcbaselines/015AF2B61DC6A538008F0A8C.xcbaseline/1F44D368-293A-49E8-B611-DF6CA453D87D.plist @@ -31,7 +31,7 @@ com.apple.XCTPerformanceMetric_WallClockTime baselineAverage - 0.141 + 0.181 baselineIntegrationDisplayName Local Baseline diff --git a/Tests/Info.plist b/Tests/Info.plist index 41f20e0e..32b4d83d 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.27.1 + 0.28.0 CFBundleSignature ???? CFBundleVersion