Updated for 0.28.0 release

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

EditorExtension/Application/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.27.1</string>
+	<string>0.28.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>

EditorExtension/Extension/Info.plist

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

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

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.27.1</string>
+	<string>0.28.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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.27.1</string>
+	<string>0.28.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>

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

@@ -6,23 +6,23 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		eNaly/5P+KLw0dfstobWxRkPh8c=
+		+75vChTbjRm/SxV/VaA4uuljvx0=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		rtKrk+t2hr/PnY5Xz62kkJIZEUQ=
+		bBfU/g+Z8f4IhcfX69F+IpCHT3Q=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		yKusWdyUSEkt1u4NLbUNk+aY7b4=
+		uvMLqv6MY/Ja8FwiKd1hsag+VSw=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
 		<data>
-		UuJzVOrd/BiUzomMHHBqevNueLs=
+		Yf8MD14bmnHP8mpmeky63qTPU+8=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
-		o4Ww08nonoSrrNGDHECY+IvT0NQ=
+		pZOBKEL92YKzg3ZYm2sSDKh9x2s=
 		</data>
 		<key>Resources/libswiftRemoteMirror.dylib</key>
 		<data>
@@ -143,7 +143,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			9QmJeIj9FnkQ8WsMYYadH90PjBQ=
+			FOpkuzGrUk4jADwq59HkMQvMHYA=
 			</data>
 			<key>requirement</key>
 			<string>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 */</string>
@@ -152,55 +152,55 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			eNaly/5P+KLw0dfstobWxRkPh8c=
+			+75vChTbjRm/SxV/VaA4uuljvx0=
 			</data>
 			<key>hash2</key>
 			<data>
-			XexXaQC8giLSWKXQblE3A1Jp0dRfqEcc/A15ntSucIE=
+			GYeKxhpF0lw2kTvYiRn3WzmUbnoaU1qAiFHLYb2gmoY=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			rtKrk+t2hr/PnY5Xz62kkJIZEUQ=
+			bBfU/g+Z8f4IhcfX69F+IpCHT3Q=
 			</data>
 			<key>hash2</key>
 			<data>
-			XxkCGSKS3i4Djuk2GioySPbgs5InnCxWuv2QUoYzys0=
+			3yBdhfagGB+moJPL/M5vwGOej79DTc2fNWDt7qN/uPk=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			yKusWdyUSEkt1u4NLbUNk+aY7b4=
+			uvMLqv6MY/Ja8FwiKd1hsag+VSw=
 			</data>
 			<key>hash2</key>
 			<data>
-			xA51IzPLkrFb2djd1j+oSe4vYZUZdH4KG9+cpJUH8Us=
+			vTN288jp+IaIPNygxmngMHz/PjfCKuEI3Nt+ZYWgdWQ=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			UuJzVOrd/BiUzomMHHBqevNueLs=
+			Yf8MD14bmnHP8mpmeky63qTPU+8=
 			</data>
 			<key>hash2</key>
 			<data>
-			7BRZ1Hzx/QThlYqNWzxMWvYuKDHchZLSrGmfJ1hOoZQ=
+			T7JYV2CLhJR+K/I7NhJh56HznEd5n6TX9/EBJfrCiwI=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			o4Ww08nonoSrrNGDHECY+IvT0NQ=
+			pZOBKEL92YKzg3ZYm2sSDKh9x2s=
 			</data>
 			<key>hash2</key>
 			<data>
-			Z53y6hNofC9a/Hdrr0iJpgQXXzwc5oGgvguGD3HA32w=
+			wJ9uEVwzRueumviMFTDGh2/LnXWxxj5rldcWR67W0vs=
 			</data>
 		</dict>
 		<key>Resources/libswiftRemoteMirror.dylib</key>

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.27.1</string>
+	<string>0.28.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

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 {

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": [

SwiftFormat.xcodeproj/xcshareddata/xcbaselines/015AF2B61DC6A538008F0A8C.xcbaseline/1F44D368-293A-49E8-B611-DF6CA453D87D.plist

@@ -31,7 +31,7 @@
 				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
 				<dict>
 					<key>baselineAverage</key>
-					<real>0.141</real>
+					<real>0.181</real>
 					<key>baselineIntegrationDisplayName</key>
 					<string>Local Baseline</string>
 				</dict>

Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.27.1</string>
+	<string>0.28.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>