Update as suggestion

realm · Oct 22, 2023 · 1b05eaa · 1b05eaa
1 parent 5e6af26
commit 1b05eaa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,7 @@
 
 #### Bug Fixes
 
-* Fix ExplicitInitRule correction.  
+* Fix correction of `explicit_init` rule by keeping significant trivia.
   [BB9z](https://github.com/BB9z)
   [#5289](https://github.com/realm/SwiftLint/issues/5289)
 

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/ExplicitInitRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/ExplicitInitRule.swift
@@ -162,6 +162,16 @@ struct ExplicitInitRule: OptInRule {
 
 
 
+                """),
+            Example("""
+            f { e in
+                A↓.init(e: e)
+            }
+            """):
+                Example("""
+                f { e in
+                    A(e: e)
+                }
                 """),
             Example("_ = GleanMetrics.Tabs.GroupedTabExtra↓.init()"):
                 Example("_ = GleanMetrics.Tabs.GroupedTabExtra()"),
@@ -201,7 +211,7 @@ private extension ExplicitInitRule {
             }
 
             correctionPositions.append(violationPosition)
-            let newNode = node.with(\.calledExpression, calledBase.with(\.trailingTrivia, []))
+            let newNode = node.with(\.calledExpression, calledBase)
             return super.visit(newNode)
         }
     }

diff --git a/Tests/SwiftLintFrameworkTests/ExplicitInitRuleTests.swift b/Tests/SwiftLintFrameworkTests/ExplicitInitRuleTests.swift
@@ -13,24 +13,9 @@ class ExplicitInitRuleTests: SwiftLintTestCase {
             Example("foo(↓.init())")
         ]
 
-        var correction = [
-            Example("""
-            f { e in
-                A↓.init(e: e)
-            }
-            """):
-                Example("""
-                f { e in
-                    A(e: e)
-                }
-                """)
-        ]
-        correction.merge(ExplicitInitRule.description.corrections) { current, _ in current }
-
         let description = ExplicitInitRule.description
             .with(nonTriggeringExamples: nonTriggeringExamples)
             .with(triggeringExamples: triggeringExamples)
-            .with(corrections: correction)
 
         verifyRule(description, ruleConfiguration: ["include_bare_init": true])
     }