fixup! Add rule requiring imports be sorted

CHANGELOG.md

@@ -83,6 +83,7 @@
 * Add a rule that enforces alphabetical sorting of imports.  
   [Scott Berrevoets](https://github.com/sberrevoets)
   [#991](https://github.com/realm/SwiftLint/pull/991)
+  [#900](https://github.com/realm/SwiftLint/issues/900)
 
 * Now builds and passes most tests on Linux using the Swift Package Manager with
   Swift 3. This requires `libsourcekitdInProc.so` to be built and located in

Source/SwiftLintFramework/Rules/SortedImportsRule.swift

@@ -11,6 +11,8 @@ import SourceKittenFramework
 public struct SortedImportsRule: ConfigurationProviderRule, OptInRule {
     public var configuration = SeverityConfiguration(.warning)
 
+    private let moduleCharacterOffset = "import ".characters.count
+
     public init() {}
 
     public static let description = RuleDescription(
@@ -21,31 +23,31 @@ public struct SortedImportsRule: ConfigurationProviderRule, OptInRule {
             "import AAA\nimport BBB\nimport CCC\nimport DDD"
         ],
         triggeringExamples: [
-            "import AAA\nimport ZZZ\nimport BBB\nimport CCC",
-            "import AAA\nimport ZZZ\nimport BBB\nimport CCC\nimport AAA"
+            "import AAA\nimport ZZZ\nimport ↓BBB\nimport CCC"
         ]
     )
 
     public func validateFile(_ file: File) -> [StyleViolation] {
-        let pattern = "import\\s+(\\w+)"
-        let excludingKinds = SyntaxKind.commentAndStringKinds()
+        let pattern = "import (\\w+)"
+
+        var previousMatch = ""
+        return file.matchPattern(pattern).flatMap { range, kinds in
+            if kinds.count != 2 || kinds[0] != .keyword || kinds[1] != .identifier {
+                return nil
+            }
 
-        let importRanges = file.matchPattern(pattern, excludingSyntaxKinds: excludingKinds)
-        let imports = importRanges.map { file.contents.substring($0.location, length: $0.length) }
+            let match = file.contents.bridge().substring(with: range)
+            defer { previousMatch = match }
 
-        var violations = [StyleViolation]()
-        for index in 0 ..< imports.count {
-            if index == 0 || imports[index] > imports[index - 1] {
-                continue
+            if match > previousMatch {
+                return nil
             }
 
-            let location = Location(file: file, characterOffset: importRanges[index].location)
-            violations.append(
-                              StyleViolation(ruleDescription: type(of: self).description,
-                                             severity: configuration.severity, location: location)
-                             )
-        }
+            let characterOffset = range.location + moduleCharacterOffset
+            let location = Location(file: file, characterOffset: characterOffset)
+            return StyleViolation(ruleDescription: type(of: self).description,
+                                  severity: configuration.severity, location: location)
 
-        return violations
+        }
     }
 }

Tests/SwiftLintFrameworkTests/RulesTests.swift

@@ -391,6 +391,7 @@ extension RulesTests {
             ("testRedundantNilCoalescing", testRedundantNilCoalescing),
             ("testRedundantStringEnumValue", testRedundantStringEnumValue),
             ("testReturnArrowWhitespace", testReturnArrowWhitespace),
+            ("testSortedImports", testSortedImports),
             ("testStatementPosition", testStatementPosition),
             ("testStatementPositionUncuddled", testStatementPositionUncuddled),
             ("testSwitchCaseOnNewline", testSwitchCaseOnNewline),