Updated for 0.17.1 release

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [0.17.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.17.1) (2016-11-09)
+
+- Xcode Source Editor Extension now works with Playground files
+- Fixed operator being incorrectly formatted when file ends with a single-line comment
+- Fixed bug where the space at the start of a single line comment could increase after each format
+- Fixed bug where `--cache clear` just ignored cache without actually clearing it
+- Added `--cache ignore` option, which replicates previous `--cache clear` behavior
+
 ## [0.17](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.17) (2016-11-08)
 
 - Added cache, allowing SwiftFormat to skip formatting for files that haven't changed
@@ -13,7 +21,7 @@
 
 - SwiftFormat is now ~3X faster!
 - Fixed bug with spacing after an @convention() attribute
-- Fixed bug where the space at the start of a comment could increase after each format
+- Fixed bug where the space at the start of a multi-line comment could increase after each format
 - Fixed bug where wrong indent was applied to wrapped array literal values
 - Fixed bug where K&R indenting would remove the linebreak before an inline block
 

CommandLineTool/main.swift

@@ -2,7 +2,7 @@
 //  main.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood
@@ -73,7 +73,7 @@ func showHelp() {
     print(" --trimwhitespace  trim trailing space. \"always\" (default) or \"nonblank-lines\"")
     print(" --insertlines     insert blank line after {. \"enabled\" (default) or \"disabled\"")
     print(" --removelines     remove blank line before }. \"enabled\" (default) or \"disabled\"")
-    print(" --header          header comments. \"strip\" to remove them, or \"ignore\" (default)")
+    print(" --header          header comments. \"strip\" to remove, or \"ignore\" (default)")
     print(" --experimental    experimental rules. \"enabled\" or \"disabled\" (default)")
     print(" --fragment        input is part of a larger file. \"true\" or \"false\" (default)")
     print(" --cache           path to cache file, or \"clear\" or \"ignore\" the default cache")

EditorExtension/Application/Info.plist

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

EditorExtension/Extension/CommandErrors.swift

@@ -2,7 +2,7 @@
 //  CommandErrors.swift
 //  Swift Formatter
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Tony Arnold on 6/10/16.
 //  Copyright 2016 Nick Lockwood

EditorExtension/Extension/FormatEntireFileCommand.swift

@@ -2,7 +2,7 @@
 //  FormatEntireFileCommand.swift
 //  Swift Formatter
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Tony Arnold on 5/10/16.
 //  Copyright 2016 Nick Lockwood

EditorExtension/Extension/FormatSelectedSourceCommand.swift

@@ -2,7 +2,7 @@
 //  FormatSelectedSourceCommand.swift
 //  Swift Formatter
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Tony Arnold on 5/10/16.
 //  Copyright 2016 Nick Lockwood

EditorExtension/Extension/Info.plist

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

EditorExtension/Extension/SourceEditorExtension.swift

@@ -2,7 +2,7 @@
 //  SourceEditorExtension.swift
 //  Swift Formatter
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Tony Arnold on 5/10/16.
 //  Copyright 2016 Nick Lockwood

EditorExtension/Extension/XCSourceTextBuffer+SwiftFormat.swift

@@ -2,7 +2,7 @@
 //  XCSourceTextBuffer+SwiftFormat.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 21/10/2016.
 //  Copyright © 2016 Nick Lockwood. All rights reserved.

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

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.17</string>
+	<string>0.17.1</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.17</string>
+	<string>0.17.1</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>
-		z7/KppXiw6gl/OFlwjx6vFz3eYM=
+		B9DzZPmjWYJwfVQd3a/gAnBffKw=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		rdrD6u7oVfyoXnXjpRSmNUMj+7E=
+		Yi4/sOsGiUr7dpcSiXlCqtbmnQE=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		tQQFALaJfhPjbR8igTwvHW84OEQ=
+		DadUmdimxeYAUfUC1E5UM+pcWvY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
 		<data>
-		hi7e4KP8eeuvcAwgK6LQVEWJbvA=
+		n8c6BVNSHbwI9+mg3gR0FJU8ECU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
-		BJ5gRj8axTYdecLJ+nPXnwACTtw=
+		UNbqG5pi4rEcuc8ZZOXuUIS8oZU=
 		</data>
 		<key>Resources/libswiftRemoteMirror.dylib</key>
 		<data>
@@ -152,7 +152,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			Z/kLrBoLU2/G611y7opdMbxYXfw=
+			DGxVH0vvJvtqDwJeolcD1GrHtGc=
 			</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>
@@ -161,55 +161,55 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			z7/KppXiw6gl/OFlwjx6vFz3eYM=
+			B9DzZPmjWYJwfVQd3a/gAnBffKw=
 			</data>
 			<key>hash2</key>
 			<data>
-			3X87NrRCb0nEmsIr7+7u5dAATmmZwERBMhTkaE5wyLk=
+			pnBMitplNRAj533CNLSQjkx3la1ffe/VbsRX4USpIZ0=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			rdrD6u7oVfyoXnXjpRSmNUMj+7E=
+			Yi4/sOsGiUr7dpcSiXlCqtbmnQE=
 			</data>
 			<key>hash2</key>
 			<data>
-			HaPHiM2U3sq8AW/e13kOXxX6zcewzCdbdF3nRnp8BEw=
+			jka7/BLi7JdQg5NbbjUqLVJWlwfFgRARySzGgr9JcTQ=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			tQQFALaJfhPjbR8igTwvHW84OEQ=
+			DadUmdimxeYAUfUC1E5UM+pcWvY=
 			</data>
 			<key>hash2</key>
 			<data>
-			4kgNEdpQzCwQSR/mFwPf8g7FA87TCry8cOvyXW3v6b8=
+			hGch1yg7jU6sAPdu7N1ELNGbaF329+1BeZTMOcJLYBc=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/ViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			hi7e4KP8eeuvcAwgK6LQVEWJbvA=
+			n8c6BVNSHbwI9+mg3gR0FJU8ECU=
 			</data>
 			<key>hash2</key>
 			<data>
-			NXsuTeioIzx4bk5YlvnC+M+LddFHbfRWnljYJyQkx4o=
+			fEnUHkc01yvgWx9hgj9+kTb+TrntW1TM0VPSc01588I=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			BJ5gRj8axTYdecLJ+nPXnwACTtw=
+			UNbqG5pi4rEcuc8ZZOXuUIS8oZU=
 			</data>
 			<key>hash2</key>
 			<data>
-			XRgqSzUBaJE7PUXAbuQPGi0ThZYs5MSYBoSznEU6xKg=
+			boEz+NPN6HwvWB9/tPUlA2NbCdPb/uYbLsdE/kITa8Q=
 			</data>
 		</dict>
 		<key>Resources/libswiftRemoteMirror.dylib</key>

SwiftFormat.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "SwiftFormat",
-  "version": "0.17",
+  "version": "0.17.1",
   "license": {
     "type": "zlib",
     "file": "LICENCE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/SwiftFormat.git",
-    "tag": "0.17"
+    "tag": "0.17.1"
   },
   "source_files": "SwiftFormat",
   "requires_arc": true,

SwiftFormat/Formatter.swift

@@ -2,7 +2,7 @@
 //  Formatter.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormat/Info.plist

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

SwiftFormat/Options.swift

@@ -2,7 +2,7 @@
 //  Rules.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 21/10/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormat/Rules.swift

@@ -2,7 +2,7 @@
 //  Rules.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormat/SwiftFormat.h

@@ -2,7 +2,7 @@
 //  SwiftFormat.h
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormat/SwiftFormat.swift

@@ -2,7 +2,7 @@
 //  SwiftFormat.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 12/08/2016.
 //  Copyright 2016 Nick Lockwood
@@ -34,7 +34,7 @@
 import Foundation
 
 /// The current SwiftFormat version
-public let version = "0.17"
+public let version = "0.17.1"
 
 /// Enumerate all swift files at the specified location and (optionally) calculate an output file URL for each
 public func enumerateSwiftFiles(withInputURL inputURL: URL, outputURL: URL? = nil, block: (URL, URL) -> Void) {

SwiftFormat/Tokenizer.swift

@@ -2,7 +2,7 @@
 //  Tokenizer.swift
 //  SwiftFormat
 //
-//  Version 0.17
+//  Version 0.17.1
 //
 //  Created by Nick Lockwood on 11/08/2016.
 //  Copyright 2016 Nick Lockwood

SwiftFormatTests/Info.plist

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