User: joe
Date: 26 Jul 23 16:51
Revision: 71f14fe3fb290b750ccd6b85baed586c21d32bd3
Summary:
Merge branch '2022.3' into 2023.1


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

Index: src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision 8e505c8cad9dfbf3a460ae2d27cffb1d38733fe9)
+++ src/main/kotlin/platform/mixin/handlers/injectionPoint/ReturnInjectionPoint.kt	(revision 71f14fe3fb290b750ccd6b85baed586c21d32bd3)
@@ -21,7 +21,7 @@
 package com.demonwav.mcdev.platform.mixin.handlers.injectionPoint
 
 import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
-import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil
+import com.demonwav.mcdev.util.hasImplicitReturnStatement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
@@ -37,7 +37,6 @@
 import com.intellij.psi.PsiReturnStatement
 import com.intellij.psi.PsiTypes
 import com.intellij.psi.controlFlow.AnalysisCanceledException
-import com.intellij.psi.controlFlow.ControlFlowUtil
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@@ -114,13 +113,13 @@
             }
 
             val rBrace = codeBlockToAnalyze.rBrace ?: return
-            val controlFlow = try {
-                HighlightControlFlowUtil.getControlFlowNoConstantEvaluate(codeBlockToAnalyze)
+            val hasImplicitReturnStatement = try {
+                hasImplicitReturnStatement(codeBlockToAnalyze)
             } catch (e: AnalysisCanceledException) {
                 return
             }
 
-            if (ControlFlowUtil.canCompleteNormally(controlFlow, 0, controlFlow.size)) {
+            if (hasImplicitReturnStatement) {
                 if (tailOnly) {
                     result.clear()
                 }