fix: occasional crash when opening kotlin files (#872)

AndroidIDEOfficial · Mar 23, 2023 · 8f5284a · 8f5284a
1 parent 1b55e8d
commit 8f5284a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt
@@ -108,12 +108,13 @@ abstract class TreeSitterLanguage(context: Context, lang: TSLanguage, type: Stri
     column: Int,
     decrementBy: Int = 0
   ): Int {
+    val indentsQuery = languageSpec.indentsQuery ?: return 0
     return TSParser().use { parser ->
       parser.language = languageSpec.language
       val tree = parser.parseString(content)
 
       return@use TSQueryCursor().use { cursor ->
-        cursor.exec(languageSpec.indentsQuery, tree.rootNode)
+        cursor.exec(indentsQuery, tree.rootNode)
 
         var indent = 0
         var match: TSQueryMatch? = cursor.nextMatch()
@@ -133,7 +134,7 @@ abstract class TreeSitterLanguage(context: Context, lang: TSLanguage, type: Stri
             break
           }
 
-          val captureName = languageSpec.indentsQuery.getCaptureNameForId(capture.index)
+          val captureName = indentsQuery.getCaptureNameForId(capture.index)
           if (captureName == "indent") {
             ++indent
           } else if (captureName == "outdent") {

diff --git a/.../src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt b/.../src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt
@@ -37,14 +37,17 @@ constructor(val spec: TsLanguageSpec, indentsQueryScm: String = "") : Closeable
     get() = spec.language
   // </editor-fold>
 
-  val indentsQuery = TSQuery(language, indentsQueryScm)
+  val indentsQuery: TSQuery? =
+    if (indentsQueryScm.isBlank()) {
+      TSQuery(language, indentsQueryScm)
+    } else null
 
   init {
-    indentsQuery.validateOrThrow(name = "indents")
+    indentsQuery?.validateOrThrow(name = "indents")
   }
 
   override fun close() {
-    indentsQuery.close()
+    indentsQuery?.close()
     spec.close()
   }
 }