Fix picking the wrong configuration with —path

CHANGELOG.md

@@ -49,6 +49,11 @@
   [Hossam Ghareeb](https://github.com/hossamghareeb)
   [#1763](https://github.com/realm/SwiftLint/issues/1763)
 
+* Fix using wrong configuration when using `--path` and when there is
+  a configuration in a parent directory.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#1744](https://github.com/realm/SwiftLint/issues/1744)
+
 ## 0.21.0: Vintage Washboard
 
 ##### Breaking

Source/SwiftLintFramework/Extensions/Configuration+Merging.swift

@@ -18,7 +18,7 @@ extension Configuration {
     }
 
     private func configuration(forPath path: String) -> Configuration {
-        if path == rootPath {
+        if path == rootDirectory {
             return self
         }
 
@@ -43,6 +43,30 @@ extension Configuration {
         return self
     }
 
+    private var rootDirectory: String? {
+        guard let rootPath = rootPath else {
+            return nil
+        }
+
+        var isDirectoryObjC: ObjCBool = false
+        guard FileManager.default.fileExists(atPath: rootPath, isDirectory: &isDirectoryObjC) else {
+            return nil
+        }
+
+        let isDirectory: Bool
+        #if os(Linux)
+            isDirectory = isDirectoryObjC
+        #else
+            isDirectory = isDirectoryObjC.boolValue
+        #endif
+
+        if isDirectory {
+            return rootPath
+        } else {
+            return rootPath.bridge().deletingLastPathComponent
+        }
+    }
+
     private struct HashableRule: Hashable {
         fileprivate let rule: Rule
 

Source/SwiftLintFramework/Models/Configuration.swift

@@ -21,12 +21,12 @@ public struct Configuration: Equatable {
 
     public static let fileName = ".swiftlint.yml"
 
-    public let included: [String]         // included
-    public let excluded: [String]         // excluded
-    public let reporter: String           // reporter (xcode, json, csv, checkstyle)
-    public var warningThreshold: Int?     // warning threshold
-    public var rootPath: String?          // the root path to search for nested configurations
-    public var configurationPath: String? // if successfully loaded from a path
+    public let included: [String]                      // included
+    public let excluded: [String]                      // excluded
+    public let reporter: String                        // reporter (xcode, json, csv, checkstyle)
+    public let warningThreshold: Int?                  // warning threshold
+    public private(set) var rootPath: String?          // the root path to search for nested configurations
+    public private(set) var configurationPath: String? // if successfully loaded from a path
     public let cachePath: String?
 
     // MARK: Rules Properties

Source/SwiftLintFramework/Models/MasterRuleList.swift

@@ -75,14 +75,14 @@ public let masterRuleList = RuleList(rules: [
     PrivateUnitTestRule.self,
     ProhibitedSuperRule.self,
     ProtocolPropertyAccessorsOrderRule.self,
-    SingleTestClassRule.self,
     RedundantDiscardableLetRule.self,
     RedundantNilCoalescingRule.self,
     RedundantOptionalInitializationRule.self,
     RedundantStringEnumValueRule.self,
     RedundantVoidReturnRule.self,
     ReturnArrowWhitespaceRule.self,
     ShorthandOperatorRule.self,
+    SingleTestClassRule.self,
     SortedImportsRule.self,
     StatementPositionRule.self,
     StrictFilePrivateRule.self,

Tests/LinuxMain.swift

@@ -66,6 +66,8 @@ extension ConfigurationTests {
         ("testIsEqualTo", testIsEqualTo),
         ("testIsNotEqualTo", testIsNotEqualTo),
         ("testCustomConfiguration", testCustomConfiguration),
+        ("testConfigurationWithSwiftFileAsRoot", testConfigurationWithSwiftFileAsRoot),
+        ("testConfigurationWithSwiftFileAsRootAndCustomConfiguration", testConfigurationWithSwiftFileAsRootAndCustomConfiguration),
         ("testConfiguresCorrectlyFromDict", testConfiguresCorrectlyFromDict),
         ("testConfigureFallsBackCorrectly", testConfigureFallsBackCorrectly),
         ("testConfiguresCorrectlyFromDeprecatedAlias", testConfiguresCorrectlyFromDeprecatedAlias),
@@ -388,14 +390,14 @@ extension RulesTests {
         ("testPrivateUnitTest", testPrivateUnitTest),
         ("testProhibitedSuper", testProhibitedSuper),
         ("testProtocolPropertyAccessorsOrder", testProtocolPropertyAccessorsOrder),
+        ("testSingleTestClass", testSingleTestClass),
         ("testRedundantDiscardableLet", testRedundantDiscardableLet),
         ("testRedundantNilCoalescing", testRedundantNilCoalescing),
         ("testRedundantOptionalInitialization", testRedundantOptionalInitialization),
         ("testRedundantStringEnumValue", testRedundantStringEnumValue),
         ("testRedundantVoidReturn", testRedundantVoidReturn),
         ("testReturnArrowWhitespace", testReturnArrowWhitespace),
         ("testShorthandOperator", testShorthandOperator),
-        ("testSingleTestClass", testSingleTestClass),
         ("testSortedImports", testSortedImports),
         ("testStatementPosition", testStatementPosition),
         ("testStatementPositionUncuddled", testStatementPositionUncuddled),
@@ -461,7 +463,10 @@ extension UnusedOptionalBindingRuleTests {
 extension VerticalWhitespaceRuleTests {
     static var allTests: [(String, (VerticalWhitespaceRuleTests) -> () throws -> Void)] = [
         ("testVerticalWhitespaceWithDefaultConfiguration", testVerticalWhitespaceWithDefaultConfiguration),
-        ("testAttributesWithMaxEmptyLines", testAttributesWithMaxEmptyLines)
+        ("testAttributesWithMaxEmptyLines", testAttributesWithMaxEmptyLines),
+        ("testAutoCorrectionWithMaxEmptyLines", testAutoCorrectionWithMaxEmptyLines),
+        ("testViolationMessageWithMaxEmptyLines", testViolationMessageWithMaxEmptyLines),
+        ("testViolationMessageWithDefaultConfiguration", testViolationMessageWithDefaultConfiguration)
     ]
 }
 

Tests/SwiftLintFrameworkTests/ConfigurationTests+ProjectMock.swift

@@ -56,9 +56,8 @@ extension ConfigurationTests {
     }
 
     var projectMockConfig0: Configuration {
-        var configuration = Configuration(path: projectMockYAML0, optional: false, quiet: true)
-        configuration.rootPath = projectMockPathLevel0
-        return configuration
+        return Configuration(path: projectMockYAML0, rootPath: projectMockPathLevel0,
+                             optional: false, quiet: true)
     }
 
     var projectMockConfig0CustomPath: Configuration {

Tests/SwiftLintFrameworkTests/ConfigurationTests.swift

@@ -195,6 +195,22 @@ class ConfigurationTests: XCTestCase {
                           projectMockConfig0CustomPath.configuration(for: file))
     }
 
+    func testConfigurationWithSwiftFileAsRoot() {
+        let configuration = Configuration(path: projectMockYAML0,
+                                          rootPath: projectMockSwift0,
+                                          optional: false, quiet: true)
+        let file = File(path: projectMockSwift0)!
+        XCTAssertEqual(configuration.configuration(for: file), configuration)
+    }
+
+    func testConfigurationWithSwiftFileAsRootAndCustomConfiguration() {
+        let configuration = Configuration(path: projectMockYAML0CustomPath,
+                                          rootPath: projectMockSwift0,
+                                          optional: false, quiet: true)
+        let file = File(path: projectMockSwift0)!
+        XCTAssertEqual(configuration.configuration(for: file), configuration)
+    }
+
     // MARK: - Testing Rules from config dictionary
 
     let testRuleList = RuleList(rules: RuleWithLevelsMock.self)