From 3c1a4ebedc318fe9d3e51cc03dee1390c28eda52 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Fri, 15 Sep 2023 09:47:09 +0530 Subject: [PATCH] fix: remove usage of deprecated 'newInstance' method in TS Languages --- .../itsaky/androidide/editor/language/java/JavaLanguage.kt | 2 +- .../itsaky/androidide/editor/language/json/JsonLanguage.kt | 2 +- .../androidide/editor/language/kotlin/KotlinLanguage.kt | 2 +- .../itsaky/androidide/editor/language/log/LogLanguage.kt | 6 ++++-- .../itsaky/androidide/editor/language/xml/XMLLanguage.kt | 6 ++++-- .../itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt | 2 +- .../itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt | 4 ++-- .../androidide/lsp/xml/providers/AdvancedEditProvider.kt | 6 +++--- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt index b5758e476..a8f68cfb6 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt @@ -36,7 +36,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch * @author Akash Yadav */ class JavaLanguage(context: Context) : - TreeSitterLanguage(context, TSLanguageJava.newInstance(), TS_TYPE) { + TreeSitterLanguage(context, TSLanguageJava.getInstance(), TS_TYPE) { companion object { diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt index b2b69ce54..e5dbfdeb8 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt @@ -28,7 +28,7 @@ import com.itsaky.androidide.treesitter.json.TSLanguageJson * @author Akash Yadav */ class JsonLanguage(context: Context) : - TreeSitterLanguage(context, TSLanguageJson.newInstance(), TS_TYPE) { + TreeSitterLanguage(context, TSLanguageJson.getInstance(), TS_TYPE) { companion object { const val TS_TYPE = "json" diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt index e7ec7c1e7..fade961bd 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt @@ -27,7 +27,7 @@ import com.itsaky.androidide.treesitter.kotlin.TSLanguageKotlin * @author Akash Yadav */ open class KotlinLanguage(context: Context) : - TreeSitterLanguage(context, TSLanguageKotlin.newInstance(), TS_TYPE_KT) { + TreeSitterLanguage(context, TSLanguageKotlin.getInstance(), TS_TYPE_KT) { companion object { val FACTORY = Factory { KotlinLanguage(it) } diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt index 2fe1181d4..77ab8c5ee 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt @@ -28,11 +28,13 @@ import com.itsaky.androidide.treesitter.log.TSLanguageLog * @author Akash Yadav */ class LogLanguage(context: Context) : - TreeSitterLanguage(context, TSLanguageLog.newInstance(), TS_TYPE) { + TreeSitterLanguage(context, TSLanguageLog.getInstance(), TS_TYPE) { companion object { + const val TS_TYPE = "log" - @JvmField val FACTORY = Factory { LogLanguage(it) } + @JvmField + val FACTORY = Factory { LogLanguage(it) } } } diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt index 7a9f82e93..f04749c1b 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt @@ -32,12 +32,14 @@ import io.github.rosemoe.sora.util.MyCharacter * @author Akash Yadav */ class XMLLanguage(context: Context) : - TreeSitterLanguage(context, lang = TSLanguageXml.newInstance(), type = TS_TYPE) { + TreeSitterLanguage(context, lang = TSLanguageXml.getInstance(), type = TS_TYPE) { companion object { + const val TS_TYPE = "xml" - @JvmField val FACTORY = Factory { XMLLanguage(it) } + @JvmField + val FACTORY = Factory { XMLLanguage(it) } } override fun getLanguageServer(): ILanguageServer? { diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt index 6a5c3cc46..9f2beeb4e 100644 --- a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt +++ b/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt @@ -40,7 +40,7 @@ object TSJavaParser : IJavaParser { private val cache = TSParseCache(15) // cache 15 results at max private var isClosed = false - private val parser = TSParser().also { it.language = TSLanguageJava.newInstance() } + private val parser = TSParser().also { it.language = TSLanguageJava.getInstance() } get() { check(!isClosed) { "${javaClass.simpleName} instance has been closed" } return field 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 0556b703e..8c6054458 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,8 +34,8 @@ object TSMethodPruner { fun prune(content: StringBuilder, tree: TSTree, cursor: Int) { val root = tree.rootNode - TSQuery.create(TSLanguageJava.newInstance(), METHOD_BODIES_QUERY).use { query -> - check(query.isValid) { "Invalid method bodies query" } + TSQuery.create(TSLanguageJava.getInstance(), METHOD_BODIES_QUERY).use { query -> + check(query.canAccess()) { "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 e6008f941..eb42c72b2 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 @@ -154,7 +154,7 @@ object AdvancedEditProvider { private fun parseXml(content: String, action: (TSTree) -> Unit) { TSParser().use { parser -> - parser.language = TSLanguageXml.newInstance() + parser.language = TSLanguageXml.getInstance() parser.parseString(content).use(action) } } @@ -164,8 +164,8 @@ object AdvancedEditProvider { queryString: String, action: (TSQuery, List) -> Unit ) { - TSQuery.create(TSLanguageXml.newInstance(), queryString).use { query -> - if (!query.isValid || query.errorType != TSQueryError.None) { + TSQuery.create(TSLanguageXml.getInstance(), queryString).use { query -> + if (!query.canAccess() || query.errorType != TSQueryError.None) { throw RuntimeException("Invalid query. Please open an issue on GitHub.") }