Improve splitToSingleLineRanges

Omit empty tokens and remove `omittingEmptyRange` parameter, since we
never used it.

Author: fwcd

Sources/SourceKitLSP/Swift/SyntaxHighlightingTokenParser.swift

@@ -205,11 +205,8 @@ struct SyntaxHighlightingTokenParser {
 
 extension Range where Bound == Position {
   /// Splits a potentially multi-line range to multiple single-line ranges.
-  fileprivate func splitToSingleLineRanges(
-    in snapshot: DocumentSnapshot,
-    omittingEmptyRange: Bool = true
-  ) -> [Self] {
-    if omittingEmptyRange && isEmpty {
+  fileprivate func splitToSingleLineRanges(in snapshot: DocumentSnapshot) -> [Self] {
+    if isEmpty {
       return []
     }
 
@@ -238,13 +235,11 @@ extension Range where Bound == Position {
         )
         return start..<end
       }
+      .filter { !$0.isEmpty }
   }
 
   /// **Public for testing**
-  public func _splitToSingleLineRanges(
-    in snapshot: DocumentSnapshot,
-    omittingEmptyRange: Bool = true
-  ) -> [Self] {
-    splitToSingleLineRanges(in: snapshot, omittingEmptyRange: omittingEmptyRange)
+  public func _splitToSingleLineRanges(in snapshot: DocumentSnapshot) -> [Self] {
+    splitToSingleLineRanges(in: snapshot)
   }
 }

Tests/SourceKitLSPTests/SemanticTokensTests.swift

@@ -204,24 +204,19 @@ final class SemanticTokensTests: XCTestCase {
     }
 
     let empty = Position(line: 0, utf16index: 1)..<Position(line: 0, utf16index: 1)
-    XCTAssertEqual(empty._splitToSingleLineRanges(in: snapshot, omittingEmptyRange: true), [])
-    XCTAssertEqual(empty._splitToSingleLineRanges(in: snapshot, omittingEmptyRange: false), [empty])
-
-    for omittingEmptyRange in [false, true] {
-      let multiLine = Position(line: 1, utf16index: 6)..<Position(line: 2, utf16index: 7)
-      XCTAssertEqual(multiLine._splitToSingleLineRanges(in: snapshot, omittingEmptyRange: omittingEmptyRange), [
-        Position(line: 1, utf16index: 6)..<Position(line: 1, utf16index: 12),
-        Position(line: 2, utf16index: 0)..<Position(line: 2, utf16index: 7),
-      ])
-
-      let emptyLines = Position(line: 2, utf16index: 14)..<Position(line: 5, utf16index: 1)
-      XCTAssertEqual(emptyLines._splitToSingleLineRanges(in: snapshot, omittingEmptyRange: omittingEmptyRange), [
-        Position(line: 2, utf16index: 14)..<Position(line: 2, utf16index: 15),
-        Position(line: 3, utf16index: 0)..<Position(line: 3, utf16index: 0),
-        Position(line: 4, utf16index: 0)..<Position(line: 4, utf16index: 0),
-        Position(line: 5, utf16index: 0)..<Position(line: 5, utf16index: 1),
-      ])
-    }
+    XCTAssertEqual(empty._splitToSingleLineRanges(in: snapshot), [])
+
+    let multiLine = Position(line: 1, utf16index: 6)..<Position(line: 2, utf16index: 7)
+    XCTAssertEqual(multiLine._splitToSingleLineRanges(in: snapshot), [
+      Position(line: 1, utf16index: 6)..<Position(line: 1, utf16index: 12),
+      Position(line: 2, utf16index: 0)..<Position(line: 2, utf16index: 7),
+    ])
+
+    let emptyLines = Position(line: 2, utf16index: 14)..<Position(line: 5, utf16index: 1)
+    XCTAssertEqual(emptyLines._splitToSingleLineRanges(in: snapshot), [
+      Position(line: 2, utf16index: 14)..<Position(line: 2, utf16index: 15),
+      Position(line: 5, utf16index: 0)..<Position(line: 5, utf16index: 1),
+    ])
   }
 
   func testEmpty() {