User: joe
Date: 28 Apr 25 15:48
Revision: deb7fb9c07894eb0940822b821a12d7e61e7d4d4
Summary:
Merge branch '2024.3' into 2025.1

# Conflicts:
#	gradle.properties
#	gradle/libs.versions.toml
#	src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9968&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 7bfb4b84a97b1ba4cee579761e9374ceea01d0c2)
+++ gradle.properties	(revision deb7fb9c07894eb0940822b821a12d7e61e7d4d4)
@@ -19,6 +19,8 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
+org.gradle.jvmargs=-Xmx1g
+
 ideaVersionName = 2025.1
 
 coreVersion = 1.8.4
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 7bfb4b84a97b1ba4cee579761e9374ceea01d0c2)
+++ gradle/libs.versions.toml	(revision deb7fb9c07894eb0940822b821a12d7e61e7d4d4)
@@ -7,9 +7,10 @@
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.4.0"
+intellij-plugin = "2.5.0"
+intellij-plugin-repository-rest-client = "2.0.46"
 intellij-ide = "2025.1"
-idea-ext = "1.1.8"
+idea-ext = "1.1.10"
 psiPlugin = "251.175"
 
 [plugins]
@@ -20,6 +21,8 @@
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 
 [libraries]
+intellij-plugin-repository-rest-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "intellij-plugin-repository-rest-client" }
+
 kotlin-plugin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
Index: src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt
===================================================================
--- src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt	(revision 7bfb4b84a97b1ba4cee579761e9374ceea01d0c2)
+++ src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt	(revision deb7fb9c07894eb0940822b821a12d7e61e7d4d4)
@@ -66,9 +66,9 @@
             } ?: return
 
             val ciType = (ciParam.type as? PsiClassType)?.resolve() ?: return
-            val searchingFor = ciType.findMethodsByName("setReturnValue", false).firstOrNull()
-                ?: ciType.findMethodsByName("cancel", false).firstOrNull()
-                ?: return
+            val searchingFor = ciType.findMethodsByName("setReturnValue", false) +
+                ciType.findMethodsByName("cancel", true)
+            searchingFor.ifEmpty { return }
 
             var mayUseCancel = false
             var definitelyUsesCancel = false
@@ -79,7 +79,7 @@
                     mayUseCancel = true
                 }
                 val methodCall = parent as? PsiReferenceExpression ?: return@Processor true
-                if (methodCall.references.any { it.isReferenceTo(searchingFor) }) {
+                if (methodCall.references.any { reference -> searchingFor.any(reference::isReferenceTo) }) {
                     definitelyUsesCancel = true
                     return@Processor false
                 }