Skip to content

Fix Text Disappearing #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thecoolwinter merged 2 commits into from
Apr 14, 2025
Merged

Fix Text Disappearing #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be668bc
Fix Text Disappearing
thecoolwinter Apr 14, 2025
a26562c
Linter
thecoolwinter Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Sources/CodeEditTextView/TextLineStorage/TextLineStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ public final class TextLineStorage<Data: Identifiable> {

public init() { }

init(root: Node<Data>, count: Int, length: Int, height: CGFloat) {
self.root = root
self.count = count
self.length = length
self.height = height
}

// MARK: - Public Methods

/// Inserts a new line for the given range.
Expand Down Expand Up @@ -408,9 +415,9 @@ private extension TextLineStorage {
} else {
transplant(nodeY, with: nodeY.right)

nodeY.right?.leftSubtreeCount = nodeY.leftSubtreeCount
nodeY.right?.leftSubtreeHeight = nodeY.leftSubtreeHeight
nodeY.right?.leftSubtreeOffset = nodeY.leftSubtreeOffset
nodeY.right?.leftSubtreeCount += nodeY.leftSubtreeCount
nodeY.right?.leftSubtreeHeight += nodeY.leftSubtreeHeight
nodeY.right?.leftSubtreeOffset += nodeY.leftSubtreeOffset

nodeY.right = nodeZ.right
nodeY.right?.parent = nodeY
Expand Down
6 changes: 6 additions & 0 deletions Sources/CodeEditTextView/TextView/TextView+ReplaceCharacters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ extension TextView {
}

textStorage.endEditing()

// Cause a layout pass now that we've finished editing, if there were any edits.
if !ranges.isEmpty {
layout()
}

if !skipUpdateSelection {
selectionManager.notifyAfterEdit()
}
Expand Down
130 changes: 121 additions & 9 deletions Tests/CodeEditTextViewTests/TextLayoutLineStorageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ fileprivate extension CGFloat {
}
}

final class TextLayoutLineStorageTests: XCTestCase {
extension UUID: @retroactive Identifiable {
public var id: UUID { self }
}

final class TextLayoutLineStorageTests: XCTestCase { // swiftlint:disable:this type_body_length

/// Creates a balanced height=3 tree useful for testing and debugging.
/// - Returns: A new tree.
fileprivate func createBalancedTree() -> TextLineStorage<TextLine> {
Expand All @@ -20,16 +25,16 @@ final class TextLayoutLineStorageTests: XCTestCase {
return tree
}

struct ChildData {
let length: Int
let count: Int
let height: CGFloat
}

/// Recursively checks that the given tree has the correct metadata everywhere.
/// - Parameter tree: The tree to check.
fileprivate func assertTreeMetadataCorrect(_ tree: TextLineStorage<TextLine>) throws {
struct ChildData {
let length: Int
let count: Int
let height: CGFloat
}

func checkChildren(_ node: TextLineStorage<TextLine>.Node<TextLine>?) -> ChildData {
fileprivate func assertTreeMetadataCorrect<T: Identifiable>(_ tree: TextLineStorage<T>) throws {
func checkChildren(_ node: TextLineStorage<T>.Node<T>?) -> ChildData {
guard let node else { return ChildData(length: 0, count: 0, height: 0.0) }
let leftSubtreeData = checkChildren(node.left)
let rightSubtreeData = checkChildren(node.right)
Expand Down Expand Up @@ -272,4 +277,111 @@ final class TextLayoutLineStorageTests: XCTestCase {
}
}
}

func test_transplantWithExistingLeftNodes() throws { // swiftlint:disable:this function_body_length
typealias Storage = TextLineStorage<UUID>
typealias Node = TextLineStorage<UUID>.Node
// Test that when transplanting a node with no left nodes, with a node with left nodes, that
// the resulting tree has valid 'left_' metadata
// 1
// / \
// 7 2
// /
// 3 ← this will be moved, this test ensures 4 retains it's left subtree count
// \
// 4
// | |
// 5 6

let node5 = Node(
length: 5,
data: UUID(),
leftSubtreeOffset: 0,
leftSubtreeHeight: 0,
leftSubtreeCount: 0,
height: 1,
left: nil,
right: nil,
parent: nil,
color: .black
)

let node6 = Node(
length: 6,
data: UUID(),
leftSubtreeOffset: 0,
leftSubtreeHeight: 0,
leftSubtreeCount: 0,
height: 1,
left: nil,
right: nil,
parent: nil,
color: .black
)

let node4 = Node(
length: 4,
data: UUID(),
leftSubtreeOffset: 5,
leftSubtreeHeight: 1,
leftSubtreeCount: 1, // node5 is on the left
height: 1,
left: node5,
right: node6,
parent: nil,
color: .black
)
node5.parent = node4
node6.parent = node4

let node3 = Node(
length: 3,
data: UUID(),
leftSubtreeOffset: 0,
leftSubtreeHeight: 0,
leftSubtreeCount: 0,
height: 1,
left: nil,
right: node4,
parent: nil,
color: .black
)
node4.parent = node3

let node2 = Node(
length: 2,
data: UUID(),
leftSubtreeOffset: 18,
leftSubtreeHeight: 4,
leftSubtreeCount: 4, // node3 is on the left
height: 1,
left: node3,
right: nil,
parent: nil,
color: .black
)
node3.parent = node2

let node7 = Node(length: 7, data: UUID(), height: 1)

let node1 = Node(
length: 1,
data: UUID(),
leftSubtreeOffset: 7,
leftSubtreeHeight: 1,
leftSubtreeCount: 1,
height: 1,
left: node7,
right: node2,
parent: nil,
color: .black
)
node2.parent = node1

let storage = Storage(root: node1, count: 7, length: 28, height: 7)

storage.delete(lineAt: 7) // Delete the root

try assertTreeMetadataCorrect(storage)
}
}