Merge branch 'fix/range-storebugs' into jump-to-definition

Author: thecoolwinter

Sources/CodeEditSourceEditor/Highlighting/Highlighter.swift

@@ -154,6 +154,7 @@ class Highlighter: NSObject {
     /// - Parameter providers: All providers to use.
     public func setProviders(_ providers: [HighlightProviding]) {
         guard let textView else { return }
+        self.styleContainer.updateStorageLength(newLength: textView.textStorage.length)
 
         let existingIds: [ObjectIdentifier] = self.highlightProviders
             .compactMap { $0.highlightProvider }

Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeContainer.swift

@@ -111,6 +111,25 @@ class StyledRangeContainer {
 }
 
 extension StyledRangeContainer: HighlightProviderStateDelegate {
+    func updateStorageLength(newLength: Int) {
+        for key in _storage.keys {
+            guard var value = _storage[key] else { continue }
+            var store = value.store
+            let length = store.length
+            if length != newLength {
+                let missingCharacters = newLength - length
+                if missingCharacters < 0 {
+                    store.storageUpdated(replacedCharactersIn: (length + missingCharacters)..<length, withCount: 0)
+                } else {
+                    store.storageUpdated(replacedCharactersIn: length..<length, withCount: missingCharacters)
+                }
+            }
+
+            value.store = store
+            _storage[key] = value
+        }
+    }
+
     /// Applies a highlight result from a highlight provider to the storage container.
     /// - Parameters:
     ///   - provider: The provider sending the highlights.

Sources/CodeEditSourceEditor/RangeStore/RangeStore.swift

@@ -84,7 +84,7 @@ struct RangeStore<Element: RangeStoreElement>: Sendable {
     ///   - runs: The runs to insert.
     ///   - range: The range to replace.
     mutating func set(runs: [Run], for range: Range<Int>) {
-        let gutsRange = 0..<_guts.count(in: OffsetMetric())
+        let gutsRange = 0..<length
         if range.clamped(to: gutsRange) != range {
             let upperBound = range.clamped(to: gutsRange).upperBound
             let missingCharacters = range.upperBound - upperBound