Add Multi-Run Method, Fix Tests, Update Tests

Author: thecoolwinter

Sources/CodeEditSourceEditor/Extensions/Range+Length.swift

@@ -10,6 +10,10 @@ import Foundation
 extension Range where Bound == Int {
     var length: Bound { upperBound - lowerBound }
 
+    /// The final index covered by this range. If the range has 0 length (upper bound = lower bound) it returns the
+    /// single value represented by the range (lower bound)
+    var lastIndex: Bound { upperBound == lowerBound ? upperBound : upperBound - 1 }
+
     init(lowerBound: Int, length: Int) {
         self = lowerBound..<(lowerBound + length)
     }

Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeStore/StyledRangeStore+Internals.swift

@@ -26,7 +26,7 @@ extension StyledRangeStore {
     ///
     /// - Parameter range: The range of the item to coalesce around.
     func coalesceNearby(range: Range<Int>) {
-        var index = findIndex(at: range.endIndex).index
+        var index = findIndex(at: range.lastIndex).index
         if index < _guts.endIndex && _guts.index(after: index) != _guts.endIndex {
             coalesceRunAfter(index: &index)
         }

Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeStore/StyledRangeStore.swift

@@ -59,12 +59,17 @@ final class StyledRangeStore {
     func set(capture: CaptureName, modifiers: Set<CaptureModifiers>, for range: Range<Int>) {
         assert(range.lowerBound >= 0, "Negative lowerBound")
         assert(range.upperBound <= _guts.count(in: OffsetMetric()), "upperBound outside valid range")
+        set(runs: [Run(length: range.length, capture: capture, modifiers: modifiers)], for: range)
+    }
 
-        let run = StyledRun(length: range.length, capture: capture, modifiers: modifiers)
-        _guts.replaceSubrange(range, in: OffsetMetric(), with: [run])
+    func set(runs: [Run], for range: Range<Int>) {
+        _guts.replaceSubrange(
+            range,
+            in: OffsetMetric(),
+            with: runs.map { StyledRun(length: $0.length, capture: $0.capture, modifiers: $0.modifiers) }
+        )
 
         coalesceNearby(range: range)
-
         cache = nil
     }
 }

Tests/CodeEditSourceEditorTests/Highlighting/StyledRangeStoreTests.swift

@@ -176,22 +176,23 @@ final class StyledRangeStoreTests: XCTestCase {
     func test_setMultipleRunsAndStorageUpdate() {
         let store = StyledRangeStore(documentLength: 100)
 
-        store.set(capture: .comment, modifiers: [.builtin], for: 5..<15)
-        store.set(capture: .keyword, modifiers: [], for: 20..<30)
-        store.set(capture: .string, modifiers: [.builtin], for: 35..<40)
-        store.set(capture: .function, modifiers: [], for: 45..<50)
-        store.set(capture: .variable, modifiers: [], for: 60..<70)
+        var lengths = [5, 10, 5, 10, 5, 5, 5, 5, 10, 10, 30]
+        var captures: [CaptureName?] = [nil, .comment, nil, .keyword, nil, .string, nil, .function, nil, .variable, nil]
+        var modifiers: [Set<CaptureModifiers>] = [[], [.builtin], [], [], [], [.builtin], [], [], [], [], []]
+
+        store.set(
+            runs: zip(zip(lengths, captures), modifiers).map {
+                StyledRangeStore.Run(length: $0.0, capture: $0.1, modifiers: $1)
+            },
+            for: 0..<100
+        )
 
         XCTAssertEqual(store.length, 100)
 
         var runs = store.runs(in: 0..<100)
         XCTAssertEqual(runs.count, 11)
         XCTAssertEqual(runs.reduce(0, { $0 + $1.length }), 100)
 
-        var lengths = [5, 10, 5, 10, 5, 5, 5, 5, 10, 10, 30]
-        var captures: [CaptureName?] = [nil, .comment, nil, .keyword, nil, .string, nil, .function, nil, .variable, nil]
-        var modifiers: [Set<CaptureModifiers>] = [[], [.builtin], [], [], [], [.builtin], [], [], [], [], []]
-
         runs.enumerated().forEach {
             XCTAssertEqual(
                 $0.element.length,