Skip to content

Commit

Permalink
refactor BigTextImpl usage of buffers[node.value.bufferIndex] to `n…
Browse files Browse the repository at this point in the history 
…ode.value.buffer`
  • Loading branch information
@sunny-chung
sunny-chung committed Sep 6, 2024
1 parent af2e94e commit 63e23c1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
35 changes: 20 additions & 15 deletions ...mMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ val logL = Logger(object : MutableLoggerConfig {

val logV = Logger(object : MutableLoggerConfig {
override var logWriterList: List<LogWriter> = listOf(JvmLogger())
override var minSeverity: Severity = Severity.Debug
override var minSeverity: Severity = Severity.Info
}, tag = "BigText.View")

internal var isD = false
Expand Down Expand Up @@ -203,7 +203,7 @@ class BigTextImpl : BigText {
val lineBreakAtNode = tree.findNodeByCharIndex(lineBreakPosition)!!
val lineStart = findLineStart(lineBreakAtNode)
val positionStartOfLineBreakNode = findPositionStart(lineBreakAtNode)
val lineBreakOffsetStarts = buffers[lineBreakAtNode.value.bufferIndex].lineOffsetStarts
val lineBreakOffsetStarts = lineBreakAtNode.value.buffer.lineOffsetStarts
val lineBreakMinIndex = lineBreakOffsetStarts.binarySearchForMinIndexOfValueAtLeast(lineBreakAtNode.value.bufferOffsetStart)
val lineBreakIndex = lineBreakOffsetStarts.binarySearchForMaxIndexOfValueAtMost(lineBreakPosition - positionStartOfLineBreakNode + lineBreakAtNode.value.bufferOffsetStart)
return (lineStart + if (lineBreakIndex < lineBreakMinIndex) {
Expand Down Expand Up @@ -241,7 +241,7 @@ class BigTextImpl : BigText {
val lineIndex = findLineIndexByRowIndex(rowIndex)
val (lineStartNode, lineIndexStart) = tree.findNodeByLineBreaks(lineIndex - 1)!!
// val positionOfLineStartNode = findPositionStart(lineStartNode)
val lineOffsetStarts = buffers[lineStartNode.value.bufferIndex].lineOffsetStarts
val lineOffsetStarts = lineStartNode.value.buffer.lineOffsetStarts
val inRangeLineStartIndex = lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(lineStartNode.value.bufferOffsetStart)
val lineOffset = if (lineIndex - 1 >= 0) {
lineOffsetStarts[inRangeLineStartIndex + lineIndex - 1 - lineIndexStart]
Expand Down Expand Up @@ -271,7 +271,7 @@ class BigTextImpl : BigText {
val (lineStartNode, lineIndexStart) = tree.findNodeByLineBreaks(lineIndex - 1)
?: throw IllegalStateException("Cannot find the node right after ${lineIndex - 1} line breaks")
// val positionOfLineStartNode = findPositionStart(lineStartNode)
val lineOffsetStarts = buffers[lineStartNode.value.bufferIndex].lineOffsetStarts
val lineOffsetStarts = lineStartNode.value.buffer.lineOffsetStarts
val inRangeLineStartIndex = lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(lineStartNode.value.bufferOffsetStart)
val lineOffset = if (lineIndex - 1 >= 0) {
lineOffsetStarts[inRangeLineStartIndex + lineIndex - 1 - lineIndexStart] - lineStartNode.value.bufferOffsetStart
Expand Down Expand Up @@ -371,6 +371,7 @@ class BigTextImpl : BigText {
bufferIndex = node!!.value.bufferIndex
bufferOffsetStart = node!!.value.bufferOffsetStart + splitAtIndex
bufferOffsetEndExclusive = oldEnd
this.buffer = buffers[bufferIndex]

leftStringLength = 0
}
Expand All @@ -388,17 +389,19 @@ class BigTextImpl : BigText {
bufferIndex = buffers.lastIndex
bufferOffsetStart = range.start
bufferOffsetEndExclusive = range.endInclusive + 1
this.buffer = buffers[bufferIndex]

leftStringLength = 0
},
secondPartNodeValue
).reversed() // IMPORTANT: the insertion order is reversed
} else if (node == null || node.value.bufferIndex != buffers.lastIndex || node.value.bufferOffsetEndExclusive != range.start) {
} else if (node == null || node.value.bufferOwnership != BufferOwnership.Owned || node.value.bufferIndex != buffers.lastIndex || node.value.bufferOffsetEndExclusive != range.start) {
log.d { "> create new node" }
listOf(BigTextNodeValue().apply {
bufferIndex = buffers.lastIndex
bufferOffsetStart = range.start
bufferOffsetEndExclusive = range.endInclusive + 1
this.buffer = buffers[bufferIndex]

leftStringLength = 0
})
Expand Down Expand Up @@ -442,7 +445,7 @@ class BigTextImpl : BigText {

fun computeCurrentNodeProperties(nodeValue: BigTextNodeValue) = with (nodeValue) {
// bufferNumLineBreaksInRange = buffers[bufferIndex].lineOffsetStarts.subSet(bufferOffsetStart, bufferOffsetEndExclusive).size
bufferNumLineBreaksInRange = buffers[bufferIndex].lineOffsetStarts.run {
bufferNumLineBreaksInRange = buffer.lineOffsetStarts.run {
binarySearchForMinIndexOfValueAtLeast(bufferOffsetEndExclusive) - maxOf(0, binarySearchForMinIndexOfValueAtLeast(bufferOffsetStart))
}
leftNumOfLineBreaks = node?.left?.numLineBreaks() ?: 0
Expand Down Expand Up @@ -497,7 +500,7 @@ class BigTextImpl : BigText {

override fun buildString(): String {
return tree.joinToString("") {
buffers[it.bufferIndex].subSequence(it.bufferOffsetStart, it.bufferOffsetEndExclusive)
it.buffer.subSequence(it.bufferOffsetStart, it.bufferOffsetEndExclusive)
}
}

Expand All @@ -519,7 +522,7 @@ class BigTextImpl : BigText {
val numCharsToCopy = minOf(endExclusive, nodeStartPos + node.value.bufferLength) - maxOf(start, nodeStartPos)
val copyUntilBufferIndex = copyFromBufferIndex + numCharsToCopy
if (numCharsToCopy > 0) {
val subsequence = buffers[node.value.bufferIndex].subSequence(copyFromBufferIndex, copyUntilBufferIndex)
val subsequence = node.value.buffer.subSequence(copyFromBufferIndex, copyUntilBufferIndex)
result.append(subsequence)
numRemainCharsToCopy -= numCharsToCopy
} else {
Expand All @@ -543,7 +546,7 @@ class BigTextImpl : BigText {
* @param lineOffset 0 = start of buffer; 1 = char index after the 1st '\n'; 2 = char index after the 2nd '\n'; ...
*/
fun findCharPosOfLineOffset(node: RedBlackTree<BigTextNodeValue>.Node, lineOffset: Int): Int {
val buffer = buffers[node.value!!.bufferIndex]
val buffer = node.value!!.buffer
val lineStartIndexInBuffer = buffer.lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(node.value!!.bufferOffsetStart)
val lineEndIndexInBuffer = buffer.lineOffsetStarts.binarySearchForMaxIndexOfValueAtMost(node.value!!.bufferOffsetEndExclusive - 1)
val offsetedLineOffset = maxOf(0, lineStartIndexInBuffer) + (lineOffset) - 1
Expand Down Expand Up @@ -676,6 +679,7 @@ class BigTextImpl : BigText {
bufferIndex = node!!.value.bufferIndex
bufferOffsetStart = node!!.value.bufferOffsetStart + splitAtIndex
bufferOffsetEndExclusive = node!!.value.bufferOffsetEndExclusive
buffer = buffers[bufferIndex]

leftStringLength = 0
}
Expand All @@ -688,6 +692,7 @@ class BigTextImpl : BigText {
bufferIndex = node!!.value.bufferIndex
bufferOffsetStart = node!!.value.bufferOffsetStart
bufferOffsetEndExclusive = node!!.value.bufferOffsetStart + splitAtIndex
buffer = buffers[bufferIndex]

leftStringLength = 0
}
Expand Down Expand Up @@ -776,7 +781,7 @@ class BigTextImpl : BigText {
}

tree.forEach {
val buffer = buffers[it.bufferIndex]
val buffer = it.buffer
val chunkString = buffer.subSequence(it.bufferOffsetStart, it.bufferOffsetEndExclusive)
layouter.indexCharWidth(chunkString.toString())
}
Expand Down Expand Up @@ -808,7 +813,7 @@ class BigTextImpl : BigText {
var lastOccupiedWidth = 0f
val treeLastIndex = tree.size() - 1
tree.forEachIndexed { index, node ->
val buffer = buffers[node.bufferIndex]
val buffer = node.buffer
val lineBreakIndexFrom = buffer.lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(node.bufferOffsetStart)
val lineBreakIndexTo = buffer.lineOffsetStarts.binarySearchForMaxIndexOfValueAtMost(node.bufferOffsetEndExclusive - 1)
var charStartIndexInBuffer = node.bufferOffsetStart
Expand Down Expand Up @@ -855,7 +860,7 @@ class BigTextImpl : BigText {
logL.v { inspect("before layout($startPos, $endPosExclusive)") }
var nodeStartPos = findPositionStart(node!!)
val nodeValue = node.value
val buffer = buffers[nodeValue.bufferIndex]
val buffer = nodeValue.buffer
var lineBreakIndexFrom = buffer.lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(
(startPos - nodeStartPos) + nodeValue.bufferOffsetStart
)
Expand Down Expand Up @@ -889,7 +894,7 @@ class BigTextImpl : BigText {
while (node != null) {
var isBreakAfterThisIteration = false
val nodeValue = node.value
val buffer = buffers[nodeValue.bufferIndex]
val buffer = nodeValue.buffer
val lineBreakIndexTo =
buffer.lineOffsetStarts.binarySearchForMaxIndexOfValueAtMost(nodeValue.bufferOffsetEndExclusive - 1)
.let {
Expand Down Expand Up @@ -1027,7 +1032,7 @@ class BigTextImpl : BigText {
if (node != null) {
nodeStartPos += nodeValue.bufferLength
val nodeValue = node.value
val buffer = buffers[nodeValue.bufferIndex]
val buffer = nodeValue.buffer
lineBreakIndexFrom = buffer.lineOffsetStarts.binarySearchForMinIndexOfValueAtLeast(nodeValue.bufferOffsetStart)
charStartIndexInBuffer = nodeValue.bufferOffsetStart
}
Expand All @@ -1048,7 +1053,7 @@ class BigTextImpl : BigText {
run {
val lastNode = tree.rightmost(tree.getRoot()).takeIf { it.isNotNil() }
val lastValue = lastNode?.value ?: return@run 0
val lastLineOffset = buffers[lastValue.bufferIndex].lineOffsetStarts.let {
val lastLineOffset = lastValue.buffer.lineOffsetStarts.let {
val lastIndex = it.binarySearchForMaxIndexOfValueAtMost(lastValue.bufferOffsetEndExclusive - 1)
if (lastIndex in 0 .. it.lastIndex) {
it[lastIndex]
Expand Down
6 changes: 6 additions & 0 deletions .../kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/bigtext/BigTextNodeValue.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class BigTextNodeValue : Comparable<BigTextNodeValue>, DebuggableNode<BigTextNod
var bufferOffsetStart: Int = -1
var bufferOffsetEndExclusive: Int = -1
var bufferNumLineBreaksInRange: Int = -1
lateinit var buffer: TextBuffer
var bufferOwnership: BufferOwnership = BufferOwnership.Owned

val bufferLength: Int
get() = bufferOffsetEndExclusive - bufferOffsetStart
Expand Down Expand Up @@ -81,3 +83,7 @@ class TextBuffer(val size: Int) {
return buffer.subSequence(start, endExclusive)
}
}

enum class BufferOwnership {
Owned, Delegated
}

0 comments on commit 63e23c1

Please sign in to comment.