mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
fix: remove usage of deprecated 'newInstance' method in TS Languages
This commit is contained in:
@@ -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 {
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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) }
|
||||
|
||||
@@ -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) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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? {
|
||||
|
||||
@@ -40,7 +40,7 @@ object TSJavaParser : IJavaParser<TSParseResult> {
|
||||
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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
+3
-3
@@ -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<TSQueryMatch>) -> 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.")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user