From 5444217ddbf5aafd880e9b9f0844d9261952e06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danny=20M=C3=B6sch?= <danny.moesch@icloud.com>
Date: Sat, 20 Jul 2024 16:30:24 +0200
Subject: [PATCH] Check at the violation position if a correction can be
 applied

---
 .../Style/OpeningBraceRuleExamples.swift      | 15 ++++++++++++
 .../SwiftSyntaxCorrectableRule.swift          | 23 ++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Source/SwiftLintBuiltInRules/Rules/Style/OpeningBraceRuleExamples.swift b/Source/SwiftLintBuiltInRules/Rules/Style/OpeningBraceRuleExamples.swift
index 19cc630465..e41dc09977 100644
--- a/Source/SwiftLintBuiltInRules/Rules/Style/OpeningBraceRuleExamples.swift
+++ b/Source/SwiftLintBuiltInRules/Rules/Style/OpeningBraceRuleExamples.swift
@@ -566,5 +566,20 @@ struct OpeningBraceRuleExamples {
                     }
                 }
                 """),
+        Example("""
+            if
+                "test".isEmpty
+            // swiftlint:disable:next opening_brace
+            {
+                // code here
+            }
+            """): Example("""
+                if
+                    "test".isEmpty
+                // swiftlint:disable:next opening_brace
+                {
+                    // code here
+                }
+                """),
     ]
 }
diff --git a/Source/SwiftLintCore/Protocols/SwiftSyntaxCorrectableRule.swift b/Source/SwiftLintCore/Protocols/SwiftSyntaxCorrectableRule.swift
index d8961d2223..f977d9b050 100644
--- a/Source/SwiftLintCore/Protocols/SwiftSyntaxCorrectableRule.swift
+++ b/Source/SwiftLintCore/Protocols/SwiftSyntaxCorrectableRule.swift
@@ -24,7 +24,7 @@ public extension SwiftSyntaxCorrectableRule {
         if let rewriter = makeRewriter(file: file) {
             let newTree = rewriter.visit(syntaxTree)
             let positions = rewriter.correctionPositions
-            if positions.isEmpty {
+            guard positions.isNotEmpty else {
                 return []
             }
             let corrections = positions
@@ -40,25 +40,32 @@ public extension SwiftSyntaxCorrectableRule {
         }
 
         // There is no rewriter. Falling back to the correction ranges collected by the visitor (if any).
-        let violationCorrections = makeVisitor(file: file)
+        let violations = makeVisitor(file: file)
             .walk(tree: syntaxTree, handler: \.violations)
-            .compactMap(\.correction)
-        if violationCorrections.isEmpty {
+        guard violations.isNotEmpty else {
             return []
         }
+
+        let locationConverter = file.locationConverter
+        let disabledRegions = file.regions()
+            .filter { $0.areRulesDisabled(ruleIDs: Self.description.allIdentifiers) }
+            .compactMap { $0.toSourceRange(locationConverter: locationConverter) }
+
         typealias CorrectionRange = (range: NSRange, correction: String)
-        let correctionRanges = violationCorrections
+        let correctionRanges = violations
+            .filter { !$0.position.isContainedIn(regions: disabledRegions, locationConverter: locationConverter) }
+            .compactMap(\.correction)
             .compactMap { correction in
                 file.stringView.NSRange(start: correction.start, end: correction.end).map { range in
                     CorrectionRange(range: range, correction: correction.replacement)
                 }
             }
-            .filter { (correctionRange: CorrectionRange) in
-                file.ruleEnabled(violatingRange: correctionRange.range, for: self) != nil
-            }
             .sorted { (lhs: CorrectionRange, rhs: CorrectionRange) -> Bool in
                 lhs.range.location > rhs.range.location
             }
+        guard correctionRanges.isNotEmpty else {
+            return []
+        }
 
         var corrections = [Correction]()
         var contents = file.contents