From d31f57b07c9f21c16bea43a79c4a12b00aebaa01 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Tue, 6 Jun 2023 00:40:49 +0530 Subject: [PATCH] fix(deps): migrate to android-tree-sitter v3.0.0 --- .idea/misc.xml | 5 +++-- .../assets/data/common/tooling-api-all.jar | Bin 16333206 -> 16333206 bytes .../editor/EditorHandlerActivity.kt | 2 -- .../treesitter/TreeSitterLanguageSpec.kt | 14 ++++++-------- gradle/libs.versions.toml | 2 +- .../lsp/java/parser/ts/TSMethodPruner.kt | 3 ++- .../lsp/xml/providers/AdvancedEditProvider.kt | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cdf5fd583..5f4648f3e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + - + - + \ No newline at end of file diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index ec0cc5f39833664a5b3dccdb2b580b019f8d83c1..eea9d6006083b595f41c84b28a63a2057adb69f1 100644 GIT binary patch delta 21363 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 MK)Kb;KhBr`AMSsOfB*mh diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt index 879b9ea5e..c55369b0d 100644 --- a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt +++ b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt @@ -60,8 +60,6 @@ import java.io.File import kotlin.collections.component1 import kotlin.collections.component2 import kotlin.collections.set -import org.greenrobot.eventbus.Subscribe -import org.greenrobot.eventbus.ThreadMode /** * Base class for EditorActivity. Handles logic for working with file editors. diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt index 2e35c182f..b30e7a9e0 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt @@ -29,18 +29,17 @@ import java.io.Closeable * @author Akash Yadav */ class TreeSitterLanguageSpec -@JvmOverloads -constructor(val spec: TsLanguageSpec, indentsQueryScm: String = "") : Closeable { +@JvmOverloads constructor(val spec: TsLanguageSpec, + indentsQueryScm: String = "" +) : Closeable { // val language: TSLanguage get() = spec.language // - val indentsQuery: TSQuery? = - if (indentsQueryScm.isBlank()) { - TSQuery(language, indentsQueryScm) - } else null + val indentsQuery: TSQuery? = TSQuery.create(language, indentsQueryScm) + .let { if (it.isValid) it else null } init { indentsQuery?.validateOrThrow(name = "indents") @@ -55,7 +54,6 @@ constructor(val spec: TsLanguageSpec, indentsQueryScm: String = "") : Closeable private fun TSQuery.validateOrThrow(name: String) { if (errorType != TSQueryError.None) { throw IllegalArgumentException( - "query(name:$name) parsing failed: ${errorType.name} at text offset $errorOffset" - ) + "query(name:$name) parsing failed: ${errorType.name} at text offset $errorOffset") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 646d1bb87..230c6a609 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ agp = "8.0.2" agp-tooling = "7.4.2" gradle-tooling = "8.1.1" kotlin = "1.8.21" -tree-sitter = "2.0.0" +tree-sitter = "3.0.0" editor = "0.21.1-5c3385c-SNAPSHOT" glide = "4.15.1" androidx-vectordrawable = "1.1.0" diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt index 0ce0f5be5..0556b703e 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt @@ -34,7 +34,8 @@ object TSMethodPruner { fun prune(content: StringBuilder, tree: TSTree, cursor: Int) { val root = tree.rootNode - TSQuery(TSLanguageJava.newInstance(), METHOD_BODIES_QUERY).use { query -> + TSQuery.create(TSLanguageJava.newInstance(), METHOD_BODIES_QUERY).use { query -> + check(query.isValid) { "Invalid method bodies query" } TSQueryCursor().use { queryCursor -> queryCursor.exec(query, root) diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt b/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt index 064393870..e6008f941 100644 --- a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt +++ b/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt @@ -164,8 +164,8 @@ object AdvancedEditProvider { queryString: String, action: (TSQuery, List) -> Unit ) { - TSQuery(TSLanguageXml.newInstance(), queryString).use { query -> - if (query.errorType != TSQueryError.None) { + TSQuery.create(TSLanguageXml.newInstance(), queryString).use { query -> + if (!query.isValid || query.errorType != TSQueryError.None) { throw RuntimeException("Invalid query. Please open an issue on GitHub.") }