Updated for 0.35.7 release

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.35.7](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.7) (2018-10-11)
+
+- Fixed error when tokenizing an `enum` declaration with a `where` clause
+- Fixed bug with spacing around an infix operator used before the `#file` keyword
+- Fixed bug where `self` was incorrectly removed inside property getters/setters
+
 ## [0.35.6](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.35.6) (2018-09-29)
 
 - Fixed bug where `self` could be incorrectly removed inside `#if` blocks

EditorExtension/Application/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.35.6</string>
+	<string>0.35.7</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.35.6</string>
+	<string>0.35.7</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.35.6</string>
+	<string>0.35.7</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10A254a</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -37,7 +37,7 @@
 	<key>DTXcode</key>
 	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>10A254a</string>
+	<string>10A255</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>NSHumanReadableCopyright</key>

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.35.6</string>
+	<string>0.35.7</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,7 +27,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10A254a</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -37,7 +37,7 @@
 	<key>DTXcode</key>
 	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>10A254a</string>
+	<string>10A255</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>NSExtension</key>

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

@@ -6,35 +6,35 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/9ZR-Qg-hHT-view-iDF-FY-6tf.nib</key>
 		<data>
-		NSnnDfg5hj649TIkg6ZgYKBJRc8=
+		FfHDSnmGy0P/ErYH1l7OMAUD2TA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		CX6sj00tz5q/5O62Sp/HaEkfjdI=
+		pNpmgDMZjl/MG2fJ4qDC/rngDME=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		mOsRG8WpNVwpI8wzpdwAXv7hes4=
+		i/kIHlylrlRCUig01uSkwZjAJcQ=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<data>
-		euRrzz448VDkd8I+YWRqnIT0+Lc=
+		M7zTlgwk45okiMzEq9Q9x4fKsTU=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		49Rp+jkFurfZW2+cwiA0Lteanvw=
+		E2zI4eMH/r+or71HmGuU0/LCWJI=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<data>
-		ntnl+KyhLS6DBNWzRjmjppIbPAg=
+		DsLZvyLvLZS9dDH0XcShsuTn7w4=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
 		AmXMPdvieE8zBdmZl6bB+ESu20c=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/lOk-3C-AtC-view-Efh-0R-Cg8.nib</key>
 		<data>
-		Pnmb3YKBg6O3PSV52NeG34rqD/w=
+		jHZgH9uD+BaNeA76k8ypnfbbEhU=
 		</data>
 		<key>Resources/libswiftRemoteMirror.dylib</key>
 		<data>
@@ -182,7 +182,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			xYjvaAnb7u01NopAG+h/AwwJbeY=
+			uUmnNMvCYbOhzqV3Z8FLPHff2Yc=
 			</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>
@@ -191,66 +191,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			NSnnDfg5hj649TIkg6ZgYKBJRc8=
+			FfHDSnmGy0P/ErYH1l7OMAUD2TA=
 			</data>
 			<key>hash2</key>
 			<data>
-			GvWaK06NMM5VkdBHngWW47zxksqND3wpQGzt35UpU90=
+			6y1ul8ynu4w5QBSPBoxE9zCT/uXLFUFGFVRlHrpvhJQ=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			CX6sj00tz5q/5O62Sp/HaEkfjdI=
+			pNpmgDMZjl/MG2fJ4qDC/rngDME=
 			</data>
 			<key>hash2</key>
 			<data>
-			RCnTGrZWIHhqaiQMkJMkNt5JLXu8TOSchRAQLJE2kXI=
+			d1OEO661of3J0OfwomA68wIXyu4ldvKWe3Sc9Sd7D8E=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			mOsRG8WpNVwpI8wzpdwAXv7hes4=
+			i/kIHlylrlRCUig01uSkwZjAJcQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			Pn2VRlc+kmyFYuo2K3zXP/3m5WTnzxq3aId5YNEpMMk=
+			GsYnJnLA/hKgOVnbf0HC/A5F1O2I8LVZ2UOEuGlPqbA=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainWindowTabViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			euRrzz448VDkd8I+YWRqnIT0+Lc=
+			M7zTlgwk45okiMzEq9Q9x4fKsTU=
 			</data>
 			<key>hash2</key>
 			<data>
-			CPgzXX1dhDTnrZCWF9wh4xeiLIDlJUD9FiIy0TxpGqg=
+			35RQK1bsB1NDK+kxv6XclAmDVhq1rUbnKsp+gz0qmDE=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			49Rp+jkFurfZW2+cwiA0Lteanvw=
+			E2zI4eMH/r+or71HmGuU0/LCWJI=
 			</data>
 			<key>hash2</key>
 			<data>
-			T/jMESFfoB2Hktca/wRVTMuXavHvwI4JDcM9UltDLJ0=
+			vjGVpJb7XNSOAGi7dArXYW2sS8fJWTiFFnvoaOC5ZPs=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/RulesViewController.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ntnl+KyhLS6DBNWzRjmjppIbPAg=
+			DsLZvyLvLZS9dDH0XcShsuTn7w4=
 			</data>
 			<key>hash2</key>
 			<data>
-			UHHdzqd7OOQr+Ga7LyeGGT9WTONP7Oj4oOkmj05gLCw=
+			6nwHpOHJb8kkC86NZGmCgiMN1QldqzuT24nibLcbL4M=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
@@ -268,11 +268,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			Pnmb3YKBg6O3PSV52NeG34rqD/w=
+			jHZgH9uD+BaNeA76k8ypnfbbEhU=
 			</data>
 			<key>hash2</key>
 			<data>
-			hidHLrQXgrxYXWY7KohQiTROajMoYB4vXsh0WC5PWiw=
+			JUjEodjeYeHjlODPXW34hDxfg3KM9MFKqOznblup8vM=
 			</data>
 		</dict>
 		<key>Resources/libswiftRemoteMirror.dylib</key>

Gemfile.lock

@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.6)
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
     clamp (0.6.5)
     colored2 (3.1.2)
     concurrent-ruby (1.0.5)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nanaimo (0.2.5)
-    nokogiri (1.8.3)
+    nanaimo (0.2.6)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     rouge (2.0.7)
-    slather (2.4.5)
+    slather (2.4.6)
       CFPropertyList (~> 2.2)
       activesupport (>= 4.0.2)
       clamp (~> 0.6)
@@ -29,12 +29,12 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.9)
+    xcodeproj (1.6.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.5)
+      nanaimo (~> 0.2.6)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
 
@@ -46,4 +46,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

Sources/Formatter.swift

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

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.35.6</string>
+	<string>0.35.7</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.35.6"
+public let version = "0.35.7"
 
 /// The standard SwiftFormat config file name
 public let swiftFormatConfigurationFile = ".swiftformat"

Sources/Tokenizer.swift

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

SwiftFormat.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "SwiftFormat",
-  "version": "0.35.6",
+  "version": "0.35.7",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/SwiftFormat.git",
-    "tag": "0.35.6"
+    "tag": "0.35.7"
   },
   "default_subspecs": "Core",
   "subspecs": [

Tests/Info.plist

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