fix(editor): improve indentation for tree sitter languages

The indentation provider for tree sitter languages has been adapted from nvim-treesitter's indentation logic.

Author: itsaky

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

@@ -29,7 +29,7 @@ class TreeSitterQueryMatch @JvmOverloads internal constructor(
   id: Int = 0,
   patternIndex: Int = 0,
   captures: Array<out TSQueryCapture?>? = null
-) : TSQueryMatch(id, patternIndex, captures),
+) : TSQueryMatch(id, patternIndex, captures, null),
   RecyclableObjectPool.Recyclable by DefaultRecyclable() {
 
   companion object {

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

@@ -0,0 +1,29 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.androidide.treesitter
+
+/**
+ * Get the first node at the line and column.
+ *
+ * @param line The 0-based line number.
+ * @param colBytes The 0-based column number in bytes.
+ */
+fun TSNode.getNodeAt(line: Int, colBytes: Int): TSNode? {
+  return getDescendantForPointRange(TSPoint.create(line, colBytes),
+    TSPoint.create(line, colBytes + 1))
+}

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

@@ -0,0 +1,30 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.androidide.treesitter
+
+/**
+ * The 0-based start line number.
+ */
+val TSRange.startLine: Int
+  get() = getStartPoint().getRow()
+
+/**
+ * The 0-based end line number.
+ */
+val TSRange.endLine: Int
+  get() = getEndPoint().getRow()

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

@@ -38,7 +38,9 @@ open class TsAnalyzeManager(val languageSpec: TsLanguageSpec, var theme: TsTheme
 
   open var styles = Styles()
 
-  private var analyzeWorker: TsAnalyzeWorker? = null
+  private var _analyzeWorker: TsAnalyzeWorker? = null
+  val analyzeWorker: TsAnalyzeWorker?
+    get() = _analyzeWorker
 
   open fun updateTheme(theme: TsTheme) {
     this.theme = theme
@@ -49,7 +51,7 @@ open class TsAnalyzeManager(val languageSpec: TsLanguageSpec, var theme: TsTheme
 
   override fun setReceiver(receiver: StyleReceiver?) {
     stylesReceiver = receiver
-    analyzeWorker?.stylesReceiver = receiver
+    _analyzeWorker?.stylesReceiver = receiver
   }
 
   override fun reset(content: ContentReference, extraArguments: Bundle) {
@@ -70,7 +72,13 @@ open class TsAnalyzeManager(val languageSpec: TsLanguageSpec, var theme: TsTheme
       lineCount = reference!!.lineCount
       edit(edit)
     }
-    analyzeWorker?.onMod(Mod(TextMod(start.index, end.index, edit, insertedContent.toString())))
+    _analyzeWorker?.onMod(Mod(TextMod(
+      start.index,
+      end.index,
+      edit,
+      insertedContent.toString(),
+      reference?.documentVersion ?: 0
+    )))
   }
 
   override fun delete(start: CharPosition, end: CharPosition, deletedContent: CharSequence) {
@@ -86,30 +94,36 @@ open class TsAnalyzeManager(val languageSpec: TsLanguageSpec, var theme: TsTheme
       lineCount = reference!!.lineCount
       edit(edit)
     }
-    analyzeWorker?.onMod(Mod(TextMod(start.index, end.index, edit, null)))
+    _analyzeWorker?.onMod(Mod(TextMod(
+      start.index,
+      end.index,
+      edit,
+      null,
+      reference?.documentVersion ?: 0
+    )))
   }
 
   override fun rerun() {
-    analyzeWorker?.stop()
-    analyzeWorker = null
+    _analyzeWorker?.stop()
+    _analyzeWorker = null
 
     (styles.spans as LineSpansGenerator?)?.tree?.close()
     styles.spans = null
     styles = Styles()
 
     val initText = reference?.reference?.toString() ?: ""
 
-    analyzeWorker = TsAnalyzeWorker(this, languageSpec, theme, styles, reference!!, spanFactory)
-    analyzeWorker!!.apply {
+    _analyzeWorker = TsAnalyzeWorker(this, languageSpec, theme, styles, reference!!, spanFactory)
+    _analyzeWorker!!.apply {
       this.stylesReceiver = this@TsAnalyzeManager.stylesReceiver
-      init(Init(initText))
+      init(Init(TextInit(initText, reference?.documentVersion ?: 0)))
       start()
     }
   }
 
   override fun destroy() {
-    analyzeWorker?.stop()
-    analyzeWorker = null
+    _analyzeWorker?.stop()
+    _analyzeWorker = null
 
     (styles.spans as LineSpansGenerator?)?.tree?.close()
     styles.spans = null

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

@@ -18,13 +18,12 @@
 package io.github.rosemoe.sora.editor.ts
 
 import com.itsaky.androidide.treesitter.TSInputEdit
-import com.itsaky.androidide.treesitter.TSParser
 import com.itsaky.androidide.treesitter.TSQueryCursor
 import com.itsaky.androidide.treesitter.TSTree
 import com.itsaky.androidide.treesitter.api.TreeSitterInputEdit
 import com.itsaky.androidide.treesitter.api.TreeSitterQueryCapture
 import com.itsaky.androidide.treesitter.api.safeExecQueryCursor
-import com.itsaky.androidide.treesitter.string.UTF16StringFactory
+import com.itsaky.androidide.treesitter.string.UTF16String
 import io.github.rosemoe.sora.data.ObjectAllocator
 import io.github.rosemoe.sora.editor.ts.spans.TsSpanFactory
 import io.github.rosemoe.sora.lang.analysis.StyleReceiver
@@ -46,7 +45,7 @@ import java.util.concurrent.LinkedBlockingQueue
 /**
  * @author Akash Yadav
  */
-internal class TsAnalyzeWorker(
+class TsAnalyzeWorker(
   private val analyzer: TsAnalyzeManager,
   private val languageSpec: TsLanguageSpec,
   private val theme: TsTheme,
@@ -72,13 +71,15 @@ internal class TsAnalyzeWorker(
   private var isInitialized = false
   private var isDestroyed = false
 
-  private var tree: TSTree? = null
-  private val localText = UTF16StringFactory.newString()
-  private val parser = TSParser.create().also {
-    it.language = languageSpec.language
-  }
+  val document = TsTextDocument(languageSpec.language)
+
+  internal val tree: TSTree?
+    get() = document.tree
+
+  internal val text: UTF16String
+    get() = document.text
 
-  fun init(init: Init) {
+  internal fun init(init: Init) {
     if (isDestroyed) {
       log.warn("Received Init after TsAnalyzeWorker has been destroyed. Ignoring...")
       return
@@ -87,7 +88,7 @@ internal class TsAnalyzeWorker(
     messageChannel.offer(init)
   }
 
-  fun onMod(mod: Mod) {
+  internal fun onMod(mod: Mod) {
     if (isDestroyed) {
       log.warn("Received Mod after TsAnalyzeWorker has been destroyed. Ignoring...")
       return
@@ -100,17 +101,13 @@ internal class TsAnalyzeWorker(
     log.debug("Stopping TsAnalyzeWorker...")
     isDestroyed = true
 
-    if (parser.isParsing) {
-      parser.requestCancellationAndWait()
-    }
+    document.requestCancellationAndWaitIfParsing()
 
     analyzerContext.close()
     messageChannel.clear()
     analyzerJob?.cancel(CancellationException("Requested to be stopped"))
     analyzerScope.cancel(CancellationException("Requested to be stopped"))
-    localText.close()
-    tree?.close()
-    parser.close()
+    document.close()
   }
 
   fun start() {
@@ -160,16 +157,14 @@ internal class TsAnalyzeWorker(
   }
 
   private fun doInit(init: Init) {
-    if (parser.isParsing) {
-      parser.requestCancellationAndWait()
-    }
+    document.requestCancellationAndWaitIfParsing()
 
     check(!isInitialized) {
       "'Init' must be the first message to TsAnalyzeWorker"
     }
 
-    localText.append(init.data)
-    tree = parser.parseString(localText)
+    document.doInit(init.data)
+    document.reparse()
     updateStyles()
 
     isInitialized = true
@@ -183,45 +178,35 @@ internal class TsAnalyzeWorker(
 
     val textMod = mod.data
     val edit = textMod.edit
-    val newText = textMod.changedText
 
     val oldTree = tree!!
     oldTree.edit(edit)
 
-    if (newText == null) {
-      localText.deleteBytes(edit.startByte, edit.oldEndByte)
-    } else {
-      if (textMod.start == localText.length) {
-        localText.append(newText)
-      } else {
-        localText.insert(textMod.start, newText)
-      }
-    }
+    document.doMod(textMod)
 
     (edit as? TreeSitterInputEdit?)?.recycle()
 
-    if (parser.isParsing) {
-      parser.requestCancellationAndWait()
-    }
+    document.requestCancellationAndWaitIfParsing()
 
     if (isDestroyed) {
       return
     }
 
-    tree = parser.parseString(oldTree, localText)
+    document.reparse(oldTree)
+
     oldTree.close()
     updateStyles()
   }
 
   private fun updateStyles() {
-    if (isDestroyed || messageChannel.isNotEmpty() || this.tree?.canAccess() != true) {
+    if (isDestroyed || messageChannel.isNotEmpty() || tree?.canAccess() != true) {
       // analyzer stopped or
       // more message need to be processed
       return
     }
 
-    val tree = this.tree!!
-    val scopedVariables = TsScopedVariables(tree, localText, languageSpec)
+    val tree = tree!!
+    val scopedVariables = TsScopedVariables(tree, text, languageSpec)
     val oldTree = (styles.spans as? LineSpansGenerator?)?.tree
     val copied = tree.copy()
 
@@ -267,7 +252,7 @@ internal class TsAnalyzeWorker(
       ) { match ->
         if (!languageSpec.blocksPredicator.doPredicate(
             languageSpec.predicates,
-            localText,
+            text,
             match
           )
         ) {
@@ -315,13 +300,19 @@ internal interface Message<T> {
   val data: T
 }
 
-internal data class Init(override val data: String) : Message<String>
+internal data class Init(override val data: TextInit) : Message<TextInit>
 
 internal data class Mod(override val data: TextMod) : Message<TextMod>
 
+internal data class TextInit(
+  val text: String,
+  val contentVersion: Long
+)
+
 internal data class TextMod(
   val start: Int,
   val end: Int,
   val edit: TSInputEdit,
-  val changedText: String?
+  val changedText: String?,
+  val contentVersion: Long
 )