Back to where we started! (working)

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -16,8 +16,9 @@ let package = Package(
     dependencies: [
         // A fast, efficient, text view for code.
         .package(
-            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.11.1"
+            path: "../CodeEditTextView"
+//            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
+//            from: "0.11.1"
         ),
         // tree-sitter languages
         .package(

Package.swift

@@ -223,23 +223,9 @@ extension Highlighter: NSTextStorageDelegate {
     ) {
         // This method is called whenever attributes are updated, so to avoid re-highlighting the entire document
         // each time an attribute is applied, we check to make sure this is in response to an edit.
-        guard editedMask.contains(.editedCharacters), let textView else { return }
-
-        let styleContainerRange: Range<Int>
-        let newLength: Int
-
-        if editedRange.length == 0 { // Deleting, editedRange is at beginning of the range that was deleted
-            styleContainerRange = editedRange.location..<(editedRange.location - delta)
-            newLength = 0
-        } else { // Replacing or inserting
-            styleContainerRange = editedRange.location..<(editedRange.location + editedRange.length - delta)
-            newLength = editedRange.length
-        }
+        guard editedMask.contains(.editedCharacters) else { return }
 
-        styleContainer.storageUpdated(
-            replacedContentIn: styleContainerRange,
-            withCount: newLength
-        )
+        styleContainer.storageUpdated(editedRange: editedRange, changeInLength: delta)
 
         if delta > 0 {
             visibleRangeProvider.visibleSet.insert(range: editedRange)

Sources/CodeEditSourceEditor/Highlighting/Highlighter.swift

@@ -127,9 +127,9 @@ class StyledRangeContainer {
         return runs.reversed()
     }
 
-    func storageUpdated(replacedContentIn range: Range<Int>, withCount newLength: Int) {
+    func storageUpdated(editedRange: NSRange, changeInLength delta: Int) {
         for key in _storage.keys {
-            _storage[key]?.storageUpdated(replacedCharactersIn: range, withCount: newLength)
+            _storage[key]?.storageUpdated(editedRange: editedRange, changeInLength: delta)
         }
     }
 }

Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeContainer.swift

@@ -22,30 +22,32 @@ final class IndentationLineFoldProvider: LineFoldProvider {
     func foldLevelAtLine(
         lineNumber: Int,
         lineRange: NSRange,
-        currentDepth: Int,
+        previousDepth: Int,
         text: NSTextStorage
-    ) -> LineFoldProviderLineInfo? {
+    ) -> [LineFoldProviderLineInfo] {
         guard let leadingIndent = text.leadingRange(in: lineRange, within: .whitespacesWithoutNewlines)?.length,
-              leadingIndent > 0 else {
-            return nil
+              leadingIndent != lineRange.length else {
+            return []
         }
 
-        if leadingIndent < currentDepth {
+        var foldIndicators: [LineFoldProviderLineInfo] = []
+
+        if leadingIndent < previousDepth {
             // End the fold at the start of whitespace
-            return .endFold(rangeEnd: lineRange.location + leadingIndent, newDepth: leadingIndent)
+            foldIndicators.append(.endFold(rangeEnd: lineRange.location + leadingIndent, newDepth: leadingIndent))
         }
 
         // Check if the next line has more indent
         let maxRange = NSRange(start: lineRange.max, end: text.length)
         guard let nextIndent = text.leadingRange(in: maxRange, within: .whitespacesWithoutNewlines)?.length,
               nextIndent > 0 else {
-            return nil
+            return foldIndicators
         }
 
-        if nextIndent > currentDepth, let trailingWhitespace = text.trailingWhitespaceRange(in: lineRange) {
-            return .startFold(rangeStart: trailingWhitespace.location, newDepth: nextIndent)
+        if nextIndent > leadingIndent, let trailingWhitespace = text.trailingWhitespaceRange(in: lineRange) {
+            foldIndicators.append(.startFold(rangeStart: trailingWhitespace.location, newDepth: nextIndent))
         }
 
-        return nil
+        return foldIndicators
     }
 }

Sources/CodeEditSourceEditor/LineFolding/FoldProviders/IndentationLineFoldProvider.swift

@@ -35,7 +35,7 @@ protocol LineFoldProvider: AnyObject {
     func foldLevelAtLine(
         lineNumber: Int,
         lineRange: NSRange,
-        currentDepth: Int,
+        previousDepth: Int,
         text: NSTextStorage
-    ) -> LineFoldProviderLineInfo?
+    ) -> [LineFoldProviderLineInfo]
 }