diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc4bfb047..07a11bf5d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
# Change Log
-## [0.47.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.1) (2020-1026)
+## [0.47.2](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.2) (2020-10-30)
+
+- The `markTypes`, `organizeDeclarations` and`extensionAccessControl` rules now respect comment directives
+- Errors in `.swiftformat` config files no longer fail silently
+- Fixed bug in `--modifierorder` config and added support for SwiftLint modifierorder syntax
+- Fixed issue where `hoistPatternLet` breaks compilation due to a quirk in Swift parser
+- Fixed bug in `hoistPatternLet` when expression is wrapped or contains spaces
+- The `typeSugar` rule is now applied in more cases
+- Fixed bug in cache logic resulting in slower formatting when using certain config options
+- Fixed crash in `indent` rule
+- Fixed bug in wrapped else indent
+
+## [0.47.1](https://github.com/nicklockwood/SwiftFormat/releases/tag/0.47.1) (2020-10-26)
- Fixed a crash when using the `fileHeader` rule
- Fixed occasional out-of-bounds crash in `markTypes` rule
diff --git a/CommandLineTool/swiftformat b/CommandLineTool/swiftformat
index abf567061..f4a168762 100755
Binary files a/CommandLineTool/swiftformat and b/CommandLineTool/swiftformat differ
diff --git a/Sources/Formatter.swift b/Sources/Formatter.swift
index 45d68d116..83f303dab 100644
--- a/Sources/Formatter.swift
+++ b/Sources/Formatter.swift
@@ -2,7 +2,7 @@
// Formatter.swift
// SwiftFormat
//
-// Version 0.47.1
+// Version 0.47.2
//
// Created by Nick Lockwood on 12/08/2016.
// Copyright 2016 Nick Lockwood
diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
index 41a35c64c..855432f0e 100644
--- a/Sources/SwiftFormat.swift
+++ b/Sources/SwiftFormat.swift
@@ -32,7 +32,7 @@
import Foundation
/// The current SwiftFormat version
-let swiftFormatVersion = "0.47.1"
+let swiftFormatVersion = "0.47.2"
public let version = swiftFormatVersion
/// The standard SwiftFormat config file name
diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
index b79152250..de29db1eb 100644
--- a/Sources/Tokenizer.swift
+++ b/Sources/Tokenizer.swift
@@ -2,7 +2,7 @@
// Tokenizer.swift
// SwiftFormat
//
-// Version 0.47.1
+// Version 0.47.2
//
// Created by Nick Lockwood on 11/08/2016.
// Copyright 2016 Nick Lockwood
diff --git a/SwiftFormat.podspec.json b/SwiftFormat.podspec.json
index 655e04e70..a0a1f0092 100644
--- a/SwiftFormat.podspec.json
+++ b/SwiftFormat.podspec.json
@@ -1,6 +1,6 @@
{
"name": "SwiftFormat",
- "version": "0.47.1",
+ "version": "0.47.2",
"license": {
"type": "MIT",
"file": "LICENSE.md"
@@ -10,7 +10,7 @@
"authors": "Nick Lockwood",
"source": {
"git": "https://github.com/nicklockwood/SwiftFormat.git",
- "tag": "0.47.1"
+ "tag": "0.47.2"
},
"default_subspecs": "Core",
"subspecs": [
diff --git a/SwiftFormat.xcodeproj/project.pbxproj b/SwiftFormat.xcodeproj/project.pbxproj
index 3c04c4d85..e4ced111b 100644
--- a/SwiftFormat.xcodeproj/project.pbxproj
+++ b/SwiftFormat.xcodeproj/project.pbxproj
@@ -1122,7 +1122,7 @@
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -1146,7 +1146,7 @@
INFOPLIST_FILE = Sources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SwiftFormat;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -1222,7 +1222,7 @@
INFOPLIST_FILE = EditorExtension/Application/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
PRODUCT_NAME = "SwiftFormat for Xcode";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1249,7 +1249,7 @@
INFOPLIST_FILE = EditorExtension/Application/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode";
PRODUCT_NAME = "SwiftFormat for Xcode";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1273,7 +1273,7 @@
INFOPLIST_FILE = EditorExtension/Extension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
PRODUCT_NAME = SwiftFormat;
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1299,7 +1299,7 @@
INFOPLIST_FILE = EditorExtension/Extension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 0.47.1;
+ MARKETING_VERSION = 0.47.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.SwiftFormat-for-Xcode.SourceEditorExtension";
PRODUCT_NAME = SwiftFormat;
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Tests/Info.plist b/Tests/Info.plist
index f30d5349f..280afff0b 100644
--- a/Tests/Info.plist
+++ b/Tests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 0.47.1
+ 0.47.2
CFBundleSignature
????
CFBundleVersion