Disabled rules in child configs are no longer automatically ignored i…

…f they are opt-in
realm · Apr 4, 2023 · c4c2571 · c4c2571
1 parent 6d4bc78
commit c4c2571
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Source/SwiftLintFramework/Extensions/Configuration+RulesWrapper.swift b/Source/SwiftLintFramework/Extensions/Configuration+RulesWrapper.swift
@@ -233,10 +233,7 @@ internal extension Configuration {
 
                 // Only use parent disabled / optIn if child config doesn't tell the opposite
                 return .default(
-                    disabled: Set(childDisabled).union(Set(disabled.filter { !childOptIn.contains($0) }))
-                        .filter {
-                            !isOptInRule($0, allRulesWrapped: newAllRulesWrapped)
-                        },
+                    disabled: Set(childDisabled).union(Set(disabled.filter { !childOptIn.contains($0) })),
                     optIn: Set(childOptIn).union(Set(optIn.filter { !childDisabled.contains($0) }))
                         .filter {
                             isOptInRule($0, allRulesWrapped: newAllRulesWrapped)

diff --git a/Tests/SwiftLintFrameworkTests/Resources/ProjectMock/ChildConfig/Test2/expected.yml b/Tests/SwiftLintFrameworkTests/Resources/ProjectMock/ChildConfig/Test2/expected.yml
@@ -2,7 +2,10 @@ opt_in_rules:
   - private_action
 
 disabled_rules:
+  - empty_count
   - force_cast
+  - private_outlet
+  - trailing_closure
 
 line_length: 80
 

diff --git a/Tests/SwiftLintFrameworkTests/Resources/ProjectMock/ParentConfig/Test2/expected.yml b/Tests/SwiftLintFrameworkTests/Resources/ProjectMock/ParentConfig/Test2/expected.yml
@@ -2,7 +2,10 @@ opt_in_rules:
   - private_action
 
 disabled_rules:
+  - empty_count
   - force_cast
+  - private_outlet
+  - trailing_closure
 
 line_length: 80