added a few selection handlers

Author: slisson

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

@@ -151,7 +151,7 @@ class CaretSelection(val layoutable: LayoutableCell, val start: Int, val end: In
                 .applyShadowing()
             if (matchingActions.isNotEmpty()) {
                 if (matchingActions.size == 1 && matchingActions.first().getMatchingText() == typedText) {
-                    matchingActions.first().execute()
+                    matchingActions.first().execute(editor)
                     return
                 }
                 editor.showCodeCompletionMenu(

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

@@ -82,7 +82,8 @@ abstract class CellTemplate<NodeT : ITypedNode, ConceptT : ITypedConcept>(val co
 
     fun getReference() = reference ?: throw IllegalStateException("reference isn't set yet")
 
-    fun createCellReference(node: ITypedNode) = TemplateCellReference(getReference(), node.untypedReference())
+    fun createCellReference(node: INode) = TemplateCellReference(getReference(), node.reference)
+    fun createCellReference(node: ITypedNode) = createCellReference(node.untyped())
 
     private fun applyTextReplacement(cellData: CellData, editorState: EditorState) {
         if (cellData is TextCellData) {
@@ -139,9 +140,14 @@ class ConstantCellTemplate<NodeT : ITypedNode, ConceptT : ITypedConcept>(concept
     inner class SideTransformWrapper(val nodeToWrap: INonExistingNode, val wrappingLink: IChildLink) : ICodeCompletionAction {
         override fun getMatchingText(): String = text
         override fun getDescription(): String = concept.getShortName()
-        override fun execute() {
+        override fun execute(editor: EditorComponent) {
             val wrapper = nodeToWrap.getParent()!!.getOrCreateNode(null).addNewChild(nodeToWrap.getContainmentLink()!!, nodeToWrap.index(), concept)
             wrapper.moveChild(wrappingLink, 0, nodeToWrap.getOrCreateNode(null))
+            editor.selectAfterUpdate {
+                val cell = editor.resolveCell(createCellReference(wrapper)).firstOrNull() ?: return@selectAfterUpdate null
+                val layoutable = cell.layoutable() ?: return@selectAfterUpdate null
+                CaretSelection(layoutable, layoutable.getLength())
+            }
         }
 
         override fun shadows(shadowed: ICodeCompletionAction): Boolean {
@@ -166,7 +172,7 @@ class ConstantCellTemplate<NodeT : ITypedNode, ConceptT : ITypedConcept>(concept
             return concept.getShortName()
         }
 
-        override fun execute() {
+        override fun execute(editor: EditorComponent) {
             location.replaceNode(concept)
         }
     }
@@ -263,8 +269,14 @@ open class PropertyCellTemplate<NodeT : ITypedNode, ConceptT : ITypedConcept>(co
             return concept.getShortName()
         }
 
-        override fun execute() {
-            location.getOrCreateNode(concept).setPropertyValue(property, value)
+        override fun execute(editor: EditorComponent) {
+            val node = location.getOrCreateNode(concept)
+            node.setPropertyValue(property, value)
+            editor.selectAfterUpdate {
+                val cell = editor.resolveCell(createCellReference(node)).firstOrNull() ?: return@selectAfterUpdate null
+                val layoutable = cell.layoutable() ?: return@selectAfterUpdate null
+                CaretSelection(layoutable, layoutable.getLength())
+            }
         }
     }
 
@@ -306,9 +318,14 @@ class ReferenceCellTemplate<NodeT : ITypedNode, ConceptT : ITypedConcept, Target
             return concept.getShortName()
         }
 
-        override fun execute() {
+        override fun execute(editor: EditorComponent) {
             val sourceNode = location.getOrCreateNode(concept)
             sourceNode.setReferenceTarget(link, target)
+            editor.selectAfterUpdate {
+                val cell = editor.resolveCell(createCellReference(sourceNode)).firstOrNull() ?: return@selectAfterUpdate null
+                val layoutable = cell.layoutable() ?: return@selectAfterUpdate null
+                CaretSelection(layoutable, layoutable.getLength())
+            }
         }
     }
 }

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

@@ -54,7 +54,7 @@ class CodeCompletionMenu(
             KnownKeys.ArrowRight -> patternEditor.moveCaret(1)
             KnownKeys.Escape -> editor.closeCodeCompletionMenu()
             KnownKeys.Enter -> {
-                getSelectedEntry()?.execute()
+                getSelectedEntry()?.execute(editor)
                 editor.closeCodeCompletionMenu()
             }
             KnownKeys.Backspace -> patternEditor.deleteText(true)
@@ -101,7 +101,7 @@ class CodeCompletionMenu(
 
     fun executeIfSingleAction() {
         if (entries.size == 1 && entries.first().getMatchingText() == patternEditor.pattern) {
-            entries.first().execute()
+            entries.first().execute(editor)
             editor.closeCodeCompletionMenu()
         }
     }
@@ -200,14 +200,14 @@ private fun IActionOrProvider.flatten(parameters: CodeCompletionParameters): Seq
 interface ICodeCompletionAction : IActionOrProvider {
     fun getMatchingText(): String
     fun getDescription(): String
-    fun execute()
+    fun execute(editor: EditorComponent)
     fun shadows(shadowed: ICodeCompletionAction) = false
     fun shadowedBy(shadowing: ICodeCompletionAction) = false
 }
 
 class CodeCompletionActionWithPostprocessor(val action: ICodeCompletionAction, val after: () -> Unit) : ICodeCompletionAction by action {
-    override fun execute() {
-        action.execute()
+    override fun execute(editor: EditorComponent) {
+        action.execute(editor)
         after()
     }
 }