performance improvement of Cell.layoutable()

Author: slisson

editor-runtime/src/commonMain/kotlin/org/modelix/editor/EditorComponent.kt

@@ -11,11 +11,13 @@ open class EditorComponent(
     val state: EditorState = EditorState()
     private var selection: Selection? = null
     private val cellIndex: IncrementalIndex<CellReference, Cell> = IncrementalIndex()
+    private val layoutablesIndex: IncrementalIndex<Cell, LayoutableCell> = IncrementalIndex()
     private var selectionUpdater: (() -> Selection?)? = null
     protected var codeCompletionMenu: CodeCompletionMenu? = null
     private var rootCell: Cell = rootCellCreator(state).also {
         it.editorComponent = this
         cellIndex.update(it.referencesIndexList)
+        layoutablesIndex.update(it.layout.layoutablesIndexList)
     }
 
     fun selectAfterUpdate(newSelection: () -> Selection?) {
@@ -24,6 +26,8 @@ open class EditorComponent(
 
     fun resolveCell(reference: CellReference): List<Cell> = cellIndex.lookup(reference)
 
+    fun resolveLayoutable(cell: Cell): LayoutableCell? = layoutablesIndex.lookup(cell).firstOrNull()
+
     private fun updateRootCell() {
         val oldRootCell = rootCell
         val newRootCell = rootCellCreator(state)
@@ -32,6 +36,7 @@ open class EditorComponent(
             newRootCell.editorComponent = this
             rootCell = newRootCell
             cellIndex.update(rootCell.referencesIndexList)
+            layoutablesIndex.update(rootCell.layout.layoutablesIndexList)
         }
     }
 

editor-runtime/src/commonMain/kotlin/org/modelix/editor/TextLayouter.kt

@@ -1,11 +1,14 @@
 package org.modelix.editor
 
 import kotlinx.html.*
+import org.modelix.incremental.IncrementalList
 
 class TextLine(words_: Iterable<Layoutable>) : IProducesHtml {
     var initialText: LayoutedText? = null
     var finalText: LayoutedText? = null
     val words: List<Layoutable> = words_.toList()
+    val layoutablesIndexList: IncrementalList<Pair<Cell, LayoutableCell>> =
+        IncrementalList.of(words.filterIsInstance<LayoutableCell>().map { it.cell to it })
 
     init {
         words.filter { it.initialLine == null }.forEach { it.initialLine = this }
@@ -51,6 +54,8 @@ class LayoutedText(
     var indent: Int = 0
 ) : IProducesHtml {
     var owner: LayoutedText? = null
+    val layoutablesIndexList: IncrementalList<Pair<Cell, LayoutableCell>> =
+        IncrementalList.concat(lines.map { it.layoutablesIndexList })
 
     init {
         lines.forEach { if (it.initialText == null) it.initialText = this }
@@ -306,8 +311,8 @@ class LayoutableCell(val cell: Cell) : Layoutable() {
 }
 
 fun Cell.layoutable(): LayoutableCell? {
-    // TODO performance
-    return rootCell().layout.lines.asSequence().flatMap { it.words }.filterIsInstance<LayoutableCell>().find { it.cell == this }
+    //return rootCell().layout.lines.asSequence().flatMap { it.words }.filterIsInstance<LayoutableCell>().find { it.cell == this }
+    return editorComponent?.resolveLayoutable(this)
 }
 
 class LayoutableIndent(val indentSize: Int): Layoutable() {