Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Akash Yadav
2023-11-16 10:26:02 +05:30
parent f67daf1a0e
commit ed24faaae3
5 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt
+22 -21
View File
@@ -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
}