diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf344d8f..a3045af92 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## [0.45.3](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.3) (2020-08-03) + +- Added `--linerange` command-line argument for partial file formatting or linting +- Added `--varattributes` option to complement `--funcattributes` and `--typeattributes` +- Fixed spurious "Unexpected static/class ..." warning in `redundantSelf` rule +- Fixed bug in tokenIndex() calculation when last line does not end in a linebreak +- Fixed bug where `self` was incorrectly removed inside trailing closures on generic type init +- Blank lines are no longer indented when using `--trimwhitespace nonblank-lines` + ## [0.45.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.45.2) (2020-08-01) - You can now tweak formatting options inside source files using `// swiftformat:options ...` directive diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat index 86dfe396a..d4b6be8b5 100755 Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ diff --git a/EditorExtension/Extension/Info.plist b/EditorExtension/Extension/Info.plist index 574042e0d..7b535bd07 100644 --- a/EditorExtension/Extension/Info.plist +++ b/EditorExtension/Extension/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.45.2 + 0.45.3 CFBundleVersion $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion diff --git a/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources b/EditorExtension/SwiftFormat for Xcode.app/Contents/CodeResources index 1763d3af9..a7a97e7ac 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 ca5ab49d6..d54bc679d 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 3b075725f..5830cf729 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 050335623..dbfcaabf2 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 7deffd4f7..daf149f0e 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 57f1d49de..474aca0db 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 87bc4ee13..1ceccc9a6 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 7d6562814..543aabc2b 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 1238007f1..695c504a1 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 10643ec09..9a016278d 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/Info.plist @@ -36,7 +36,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.45.2 + 0.45.3 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 7d5a797e5..8e09cd532 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/Frameworks/XcodeKit.framework/Versions/A/XcodeKit b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/XcodeKit index 48222aeb5..e42d08638 100755 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/XcodeKit and b/EditorExtension/SwiftFormat for Xcode.app/Contents/PlugIns/SwiftFormat.appex/Contents/Frameworks/XcodeKit.framework/Versions/A/XcodeKit 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 f87d82f7e..b7fd7b5e1 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.45.2 + 0.45.3 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 4932b30b8..6c8451aad 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/Assets.car b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Assets.car index 90ac37e27..7683833cf 100644 Binary files a/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Assets.car and b/EditorExtension/SwiftFormat for Xcode.app/Contents/Resources/Assets.car 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 8602c2513..5200799d6 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 f19997d8e..2b9ac2e5d 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 fe65c728f..2d406c39d 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 9a58b2a98..16e522a34 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 53be2ea17..1cbcc7d77 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 e6f0c7e0a..f9ced9577 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 3d9ad4300..ba09e1166 100644 --- a/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources +++ b/EditorExtension/SwiftFormat for Xcode.app/Contents/_CodeSignature/CodeResources @@ -10,31 +10,31 @@ Resources/Assets.car - v18vqa3EmpFqLADs7Xt0GeU/8hg= + NGYz80PMNDXVIMVmFTREBz/iROc= Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib - 7nW2Ejdf+JPpz+j2sT9uwt0JwoY= + 9Xh1jYO+bFA+NHVtpeOnYd8arQ0= Resources/Base.lproj/Main.storyboardc/Info.plist - tBTXZJrzuLo5l4ubY535myPTxlw= + jj/gB3C/HlPyWdShowzTI9Pw3OE= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - pBYgFqMHgG9md1EzknU744C6NjY= + Jd6kdJVLKKwnENi7hgSFftF3jJc= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib - KmYwn6m652rN9jeESe4Glg1Zgg0= + z9aMR02r7l9Sq3MZfjO7wYnKttk= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - w0dGuJJ0qCGGUbajOtVI2oHLvTQ= + CidnMSH1GKqAFPxOo9sNgLon4ps= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib - 9sAckjyixq5R8BF+iKw7Js9xiUM= + NKApkw/2lWyymvwWZOGXBw2wv9M= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib @@ -119,7 +119,7 @@ cdhash - jpxVjBeAZCqgam7YriAUokujEak= + iItVjWzMP0f8rcESpNAgaVBdCOA= 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") @@ -139,77 +139,77 @@ hash - v18vqa3EmpFqLADs7Xt0GeU/8hg= + NGYz80PMNDXVIMVmFTREBz/iROc= hash2 - KNfy3NN2YIqKIAzMUwoQcnDR3tedTExbCywF8ZRf25g= + atGt7U9zr27xAn9IXvhzwrAaFX0ElyAi6OEIz37Walk= Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib hash - 7nW2Ejdf+JPpz+j2sT9uwt0JwoY= + 9Xh1jYO+bFA+NHVtpeOnYd8arQ0= hash2 - 9yFKmXGZSLeNBt2fU2cGwKkXnZr9LDQ8iRfLMZShou4= + W8XwfvtYivKv4sAee3R7EARnBg3QVbXCcWA3V2bd53A= Resources/Base.lproj/Main.storyboardc/Info.plist hash - tBTXZJrzuLo5l4ubY535myPTxlw= + jj/gB3C/HlPyWdShowzTI9Pw3OE= hash2 - 8nWaKakFF3btVOGJZr3nMUpNQ8SuAhvXjOc3BK538XY= + CkHEl+eT8GEspgq/JxvlO6ydRdOowceMrTDCl/vd6lo= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash - pBYgFqMHgG9md1EzknU744C6NjY= + Jd6kdJVLKKwnENi7hgSFftF3jJc= hash2 - qo4BSqIxmPNvc/QRo2GsB8pH2l4f5l0GmbjXwTjzsoU= + txJu8/609e6tLI/WRrtoKC7ytvhn3nf0aX02D3MJcLE= Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib hash - KmYwn6m652rN9jeESe4Glg1Zgg0= + z9aMR02r7l9Sq3MZfjO7wYnKttk= hash2 - 936dSGOMgk7EedXSc+qWMIOl9xi0fe/JaCLXwFGovzY= + W3WFdEYXiGlMCYm+mb7J4Gqyo/kXrRa/5PrMgrAqLns= Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib hash - w0dGuJJ0qCGGUbajOtVI2oHLvTQ= + CidnMSH1GKqAFPxOo9sNgLon4ps= hash2 - 5ksn7PzIigN9hmJuViS79EEVAy7UzYppDhoExAnjyYs= + hESV19m44Cdqnga5Tc6NAP0rjMggkU5PYAZzlHPx4qE= Resources/Base.lproj/Main.storyboardc/RulesViewController.nib hash - 9sAckjyixq5R8BF+iKw7Js9xiUM= + NKApkw/2lWyymvwWZOGXBw2wv9M= hash2 - 7Z+iuUgbW8cxmcWcRTXRG59J7pQlOTYR1UOX6XT3W70= + M5gEkcwjOnL4EISCbiaaag6KSeezxd18qLPfe+C0UEA= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift index 25bf44931..c6f5f31e5 100644 --- a/Sources/Formatter.swift +++ b/Sources/Formatter.swift @@ -2,7 +2,7 @@ // Formatter.swift // SwiftFormat // -// Version 0.45.2 +// Version 0.45.3 // // Created by Nick Lockwood on 12/08/2016. // Copyright 2016 Nick Lockwood diff --git a/Sources/Info.plist b/Sources/Info.plist index e1d9a4437..67f7191dc 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.45.2 + 0.45.3 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift index 6d130903a..028006151 100644 --- a/Sources/SwiftFormat.swift +++ b/Sources/SwiftFormat.swift @@ -32,7 +32,7 @@ import Foundation /// The current SwiftFormat version -let swiftFormatVersion = "0.45.2" +let swiftFormatVersion = "0.45.3" public let version = swiftFormatVersion /// The standard SwiftFormat config file name diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift index 81ea55c13..219832317 100644 --- a/Sources/Tokenizer.swift +++ b/Sources/Tokenizer.swift @@ -2,7 +2,7 @@ // Tokenizer.swift // SwiftFormat // -// Version 0.45.2 +// Version 0.45.3 // // Created by Nick Lockwood on 11/08/2016. // Copyright 2016 Nick Lockwood diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json index 695476339..8b31693c3 100644 --- a/SwiftFormat.podspec.json +++ b/SwiftFormat.podspec.json @@ -1,6 +1,6 @@ { "name": "SwiftFormat", - "version": "0.45.2", + "version": "0.45.3", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/SwiftFormat.git", - "tag": "0.45.2" + "tag": "0.45.3" }, "default_subspecs": "Core", "subspecs": [ diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj index da3d6dbb0..1197cd7ea 100644 --- a/SwiftFormat.xcodeproj/project.pbxproj +++ b/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.2; + MARKETING_VERSION = 0.45.3; 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.2; + MARKETING_VERSION = 0.45.3; PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode"; PRODUCT_NAME = "SwiftFormat for Xcode"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Tests/Info.plist b/Tests/Info.plist index ff079c45d..844d45bbb 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.45.2 + 0.45.3 CFBundleSignature ???? CFBundleVersion