fix(editor/treesiter): inline TSQueryCursor.safeExecQueryCursor API

editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt

@@ -25,7 +25,8 @@ import com.itsaky.androidide.treesitter.TSQueryMatch
 import com.itsaky.androidide.treesitter.TSTree
 import com.itsaky.androidide.utils.ILogger
 
-private val log = ILogger.newInstance("TsUtilsKt")
+@PublishedApi
+internal val log = ILogger.newInstance("TsUtilsKt")
 
 /**
  * Safely create a query cursor and execute the given [TSQuery]. The given [action] will be called for
@@ -34,16 +35,16 @@ private val log = ILogger.newInstance("TsUtilsKt")
  *
  * This method does not close the [TSQueryCursor] instance.
  */
-fun <ResultT> TSQueryCursor.safeExecQueryCursor(
+inline fun <ResultT> TSQueryCursor.safeExecQueryCursor(
   query: TSQuery,
   tree: TSTree?,
   recycleNodeAfterUse: Boolean = true,
-  matchCondition: ((TSQueryMatch?) -> Boolean)? = null,
-  whileTrue: ((TSQueryMatch?) -> Boolean)? = null,
-  onClosedOrEdited: (() -> Unit)? = null,
+  crossinline matchCondition: (TSQueryMatch?) -> Boolean = { true },
+  crossinline whileTrue: (TSQueryMatch?) -> Boolean = { true },
+  crossinline onClosedOrEdited: () -> Unit = {},
   debugName: String = "",
   debugLogging: Boolean = false,
-  action: (TSQueryMatch) -> ResultT
+  crossinline action: (TSQueryMatch) -> ResultT
 ) : ResultT? {
 
   log.isEnabled = debugLogging
@@ -64,7 +65,7 @@ fun <ResultT> TSQueryCursor.safeExecQueryCursor(
     node = rootNode,
     recycleNodeAfterUse = recycleNodeAfterUse,
     matchCondition = {
-      val result = tree.canAccess() && (matchCondition?.invoke(it) ?: true)
+      val result = tree.canAccess() && matchCondition(it)
       if (!result) {
         log.debug("$debugName: tree.canAccess=${tree.canAccess()}")
       }
@@ -85,16 +86,16 @@ fun <ResultT> TSQueryCursor.safeExecQueryCursor(
  *
  * This method does not close the [TSQueryCursor] instance.
  */
-fun <ResultT> TSQueryCursor.safeExecQueryCursor(
+inline fun <ResultT> TSQueryCursor.safeExecQueryCursor(
   query: TSQuery,
   node: TSNode,
   recycleNodeAfterUse: Boolean = true,
-  matchCondition: ((TSQueryMatch?) -> Boolean)? = null,
-  whileTrue: ((TSQueryMatch?) -> Boolean)? = null,
-  onClosedOrEdited: (() -> Unit)? = null,
+  crossinline matchCondition: (TSQueryMatch?) -> Boolean = { true },
+  crossinline whileTrue: (TSQueryMatch?) -> Boolean = { true },
+  crossinline onClosedOrEdited: () -> Unit = {},
   debugName: String = "",
   debugLogging: Boolean = false,
-  action: (TSQueryMatch) -> ResultT
+  crossinline action: (TSQueryMatch) -> ResultT
 ) : ResultT? {
 
   return doSafeExecQueryCursor(
@@ -102,8 +103,7 @@ fun <ResultT> TSQueryCursor.safeExecQueryCursor(
     node = node,
     recycleNodeAfterUse = recycleNodeAfterUse,
     matchCondition = { match ->
-      match != null && canAccess() && node.canAccess() && !node.hasChanges() && (matchCondition?.invoke(
-        match) ?: true)
+      match != null && canAccess() && node.canAccess() && !node.hasChanges() && matchCondition(match)
     },
     whileTrue = whileTrue,
     onClosedOrEdited = onClosedOrEdited,
@@ -112,16 +112,17 @@ fun <ResultT> TSQueryCursor.safeExecQueryCursor(
     action = action)
 }
 
-private fun <ResultT> TSQueryCursor.doSafeExecQueryCursor(
+@PublishedApi
+internal inline fun <ResultT> TSQueryCursor.doSafeExecQueryCursor(
   query: TSQuery,
   node: TSNode,
   recycleNodeAfterUse: Boolean = true,
-  matchCondition: (TSQueryMatch?) -> Boolean,
-  whileTrue: ((TSQueryMatch?) -> Boolean)? = null,
-  onClosedOrEdited: (() -> Unit)? = null,
+  crossinline matchCondition: (TSQueryMatch?) -> Boolean,
+  crossinline whileTrue: (TSQueryMatch?) -> Boolean,
+  crossinline onClosedOrEdited: () -> Unit,
   debugName: String = "",
   debugLogging: Boolean = false,
-  action: (TSQueryMatch) -> ResultT
+  crossinline action: (TSQueryMatch) -> ResultT
 ) : ResultT? {
 
   log.isEnabled = debugLogging
@@ -138,7 +139,7 @@ private fun <ResultT> TSQueryCursor.doSafeExecQueryCursor(
 
   exec(query, node)
   var match = nextMatch()
-  while (matchCondition(match) && (whileTrue?.invoke(match) != false)) {
+  while (matchCondition(match) && whileTrue(match)) {
 
     val result = action(match)
 
@@ -150,7 +151,7 @@ private fun <ResultT> TSQueryCursor.doSafeExecQueryCursor(
         "node.canAccess=${node.canAccess()}",
         "node.hasChanges=${node.canAccess() && node.hasErrors()}"
       )
-      onClosedOrEdited?.invoke()
+      onClosedOrEdited()
       break
     }
 

editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LineSpansGenerator.kt

@@ -118,8 +118,6 @@ class LineSpansGenerator(
         query = languageSpec.tsQuery,
         tree = tree,
         recycleNodeAfterUse = true,
-        matchCondition = null,
-        onClosedOrEdited = null,
         debugLogging = false,
         debugName = "LineSpansGenerator.captureRegion()"
       ) { match ->

editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeWorker.kt

@@ -223,8 +223,6 @@ internal class TsAnalyzeWorker(
         query = languageSpec.blocksQuery,
         tree = tree,
         recycleNodeAfterUse = true,
-        matchCondition = null,
-        whileTrue = null,
         onClosedOrEdited = { blocks.clear() },
         debugName = "TsAnalyzeManager.updateCodeBlocks()"
       ) { match ->

editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsBracketPairs.kt

@@ -63,9 +63,7 @@ class TsBracketPairs(private val tree: TSTree, private val languageSpec: TsLangu
         query = languageSpec.bracketsQuery,
         tree = tree,
         recycleNodeAfterUse = true,
-        matchCondition = null,
         whileTrue = { !matched },
-        onClosedOrEdited = null,
         debugName = "TsBracketPairs.getPairedBracketAt()"
       ) { match ->
         if (!languageSpec.bracketsPredicator.doPredicate(languageSpec.predicates, text, match)) {

editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsScopedVariables.kt

@@ -77,7 +77,6 @@ class TsScopedVariables(tree: TSTree, text: UTF16String, val spec: TsLanguageSpe
           query = spec.tsQuery,
           tree = tree,
           recycleNodeAfterUse = true,
-          matchCondition = null,
           onClosedOrEdited = { captures.clear() },
           debugName = "TsScopedVariables.init()"
         ) { match ->