User: joe
Date: 23 Apr 25 13:50
Revision: 34140d79eb066a1d75b7be2e99141faabca8d0c9
Summary:
Allow CallbackInfoReturnable.cancel() in MixinCancellableInspection


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

Index: src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt
===================================================================
--- src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt	(revision 3cdb8d8a91bbfb5becd1fe398503bc90bb3e8584)
+++ src/main/kotlin/platform/mixin/inspection/MixinCancellableInspection.kt	(revision 34140d79eb066a1d75b7be2e99141faabca8d0c9)
@@ -65,9 +65,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", false)
+            searchingFor.ifEmpty { return }
 
             var mayUseCancel = false
             var definitelyUsesCancel = false
@@ -78,7 +78,7 @@
                     mayUseCancel = true
                 }
                 val methodCall = parent as? PsiReferenceExpression ?: continue
-                if (methodCall.references.any { it.isReferenceTo(searchingFor) }) {
+                if (methodCall.references.any { reference -> searchingFor.any(reference::isReferenceTo) }) {
                     definitelyUsesCancel = true
                     break
                 }