Fix --nilInit insert being applied to as keyword

RakuyoKit · Jul 15, 2024 · f2af2f3 · f2af2f3
1 parent 4433c16
commit f2af2f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -2956,7 +2956,8 @@ public struct _FormatRules {
                 if formatter.index(of: .endOfStatement, in: index + 1 ..< optionalIndex) != nil {
                     return
                 }
-                if !formatter.tokens[optionalIndex - 1].isSpaceOrCommentOrLinebreak {
+                let previousToken = formatter.tokens[optionalIndex - 1]
+                if !previousToken.isSpaceOrCommentOrLinebreak && previousToken != .keyword("as") {
                     let equalsIndex = formatter.index(of: .nonSpaceOrLinebreak, after: optionalIndex, if: {
                         $0 == .operator("=", .infix)
                     })

diff --git a/Tests/RulesTests+Redundancy.swift b/Tests/RulesTests+Redundancy.swift
@@ -2266,6 +2266,16 @@ class RedundancyTests: RulesTests {
                        options: options)
     }
 
+    func testNoInsertNilInitInAs() {
+        let input = """
+        let json: Any = ["key": 1]
+        var jsonObject = json as? [String: Int]
+        """
+        let options = FormatOptions(nilInit: .insert)
+        testFormatting(for: input, rule: FormatRules.redundantNilInit,
+                       options: options)
+    }
+
     // MARK: - redundantLet
 
     func testRemoveRedundantLet() {