Merge 6a391e4 into 2f1d164

nicklockwood · Mar 26, 2020 · 4767473 · 4767473
2 parents 2f1d164 + 6a391e4
commit 4767473
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -2014,7 +2014,7 @@ public struct _FormatRules {
                 }), let quoteIndex = formatter.index(of: .nonSpaceOrLinebreak, after: equalsIndex, if: {
                     $0 == .startOfScope("\"")
                 }), formatter.token(at: quoteIndex + 2) == .endOfScope("\"") {
-                    if formatter.tokens[nameIndex].string == formatter.token(at: quoteIndex + 1)?.string {
+                    if formatter.tokens[nameIndex].unescaped() == formatter.token(at: quoteIndex + 1)?.string {
                         formatter.removeTokens(inRange: nameIndex + 1 ... quoteIndex + 2)
                         index = nameIndex
                     } else {

diff --git a/Tests/RulesTests.swift b/Tests/RulesTests.swift
@@ -5168,6 +5168,12 @@ class RulesTests: XCTestCase {
         testFormatting(for: input, output, rule: FormatRules.redundantRawValues)
     }
 
+    func testRemoveBacktickCaseRawStringCases() {
+        let input = "enum Foo: String { case `as` = \"as\", `let` = \"let\" }"
+        let output = "enum Foo: String { case `as`, `let` }"
+        testFormatting(for: input, output, rule: FormatRules.redundantRawValues)
+    }
+
     func testNoRemoveRawStringIfNameDoesntMatch() {
         let input = "enum Foo: String {\n    case bar = \"foo\"\n}"
         testFormatting(for: input, rule: FormatRules.redundantRawValues)