Fix false psitives for that were found because of tokens order

realm · Oct 24, 2019 · 743abea · 743abea
1 parent d40b7d9
commit 743abea
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Source/SwiftLintFramework/Extensions/SyntaxMap+SwiftLint.swift b/Source/SwiftLintFramework/Extensions/SyntaxMap+SwiftLint.swift
@@ -15,11 +15,17 @@ extension SyntaxMap {
             return []
         }
 
-        let intersectingTokens = tokens
+        func isAfterByteRange(_ token: SyntaxToken) -> Bool {
+            return token.offset < byteRange.upperBound
+        }
+
+        let tokensAfterFirstIntersection = tokens
             .lazy
             .suffix(from: startIndex)
-            .prefix(while: intersect)
-        return Array(intersectingTokens)
+            .prefix(while: isAfterByteRange)
+            .filter(intersect)
+
+        return Array(tokensAfterFirstIntersection)
     }
 
     // Index of first token which intersects byterange