User: rednesto
Date: 05 Jul 23 17:14
Revision: a8ecce5f714a903ab5ee989502bade8a68e412c0
Summary:
Fix minecraft-dev/mcdev-error-report#904


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

Index: src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision bcf7501b86b0f111e4d9ee5e0441e5aa19cd307b)
+++ src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision a8ecce5f714a903ab5ee989502bade8a68e412c0)
@@ -36,6 +36,7 @@
 import com.intellij.psi.PsiMethodReferenceExpression
 import com.intellij.psi.PsiReturnStatement
 import com.intellij.psi.PsiType
+import com.intellij.psi.controlFlow.AnalysisCanceledException
 import com.intellij.psi.controlFlow.ControlFlowUtil
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -113,7 +114,12 @@
             }
 
             val rBrace = codeBlockToAnalyze.rBrace ?: return
-            val controlFlow = HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(codeBlockToAnalyze)
+            val controlFlow = try {
+                HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(codeBlockToAnalyze)
+            } catch (e: AnalysisCanceledException) {
+                return
+            }
+
             if (ControlFlowUtil.canCompleteNormally(controlFlow, 0, controlFlow.size)) {
                 if (tailOnly) {
                     result.clear()