Fix false positives when line ends with carriage return + line feed (#…

…3061)

Fixes: #3060

CHANGELOG.md

@@ -33,6 +33,10 @@
 * Fix crash when non-closed #if was present in file.
   [PaulTaykalo](https://github.com/PaulTaykalo)
 
+* Fix false positives when line ends with carriage return + line feed
+  [John Mueller](https://github.com/john-mueller)
+  [#3060](https://github.com/realm/SwiftLint/issues/3060)
+
 ## 0.38.2: Machine Repair Manual
 
 #### Breaking

Source/SwiftLintFramework/Models/Command.swift

@@ -124,7 +124,7 @@ public struct Command: Equatable {
             let startOfCommentPastDelimiter = scanner.scanLocation + Command.commentDelimiter.count
             trailingComment = scanner.string.bridge().substring(from: startOfCommentPastDelimiter)
         }
-        let ruleTexts = rawRuleTexts.components(separatedBy: .whitespaces).filter {
+        let ruleTexts = rawRuleTexts.components(separatedBy: .whitespacesAndNewlines).filter {
             let component = $0.trimmingCharacters(in: .whitespaces)
             return !component.isEmpty && component != "*/"
         }

Tests/LinuxMain.swift

@@ -787,6 +787,12 @@ extension LetVarWhitespaceRuleTests {
     ]
 }
 
+extension LineEndingTests {
+    static var allTests: [(String, (LineEndingTests) -> () throws -> Void)] = [
+        ("testCarriageReturnDoesNotCauseError", testCarriageReturnDoesNotCauseError)
+    ]
+}
+
 extension LineLengthConfigurationTests {
     static var allTests: [(String, (LineLengthConfigurationTests) -> () throws -> Void)] = [
         ("testLineLengthConfigurationInitializerSetsLength", testLineLengthConfigurationInitializerSetsLength),
@@ -1735,6 +1741,7 @@ XCTMain([
     testCase(LegacyNSGeometryFunctionsRuleTests.allTests),
     testCase(LegacyRandomRuleTests.allTests),
     testCase(LetVarWhitespaceRuleTests.allTests),
+    testCase(LineEndingTests.allTests),
     testCase(LineLengthConfigurationTests.allTests),
     testCase(LineLengthRuleTests.allTests),
     testCase(LinterCacheTests.allTests),

Tests/SwiftLintFrameworkTests/LineEndingTests.swift

@@ -0,0 +1,12 @@
+@testable import SwiftLintFramework
+import XCTest
+
+class LineEndingTests: XCTestCase {
+    func testCarriageReturnDoesNotCauseError() {
+        XCTAssert(
+            violations(
+                "//swiftlint:disable all\r\nprint(123)\r\n"
+            ).isEmpty
+        )
+    }
+}