User: joe
Date: 13 Nov 25 22:55
Revision: a3b5f894047c10cc740af60334897a157dbd8349
Summary:
Merge branch '2024.3' into 2025.1


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10264&personal=false

Index: src/main/kotlin/platform/mixin/inspection/mixinextras/UnnecessaryMutableLocalInspection.kt
===================================================================
--- src/main/kotlin/platform/mixin/inspection/mixinextras/UnnecessaryMutableLocalInspection.kt	(revision e2b5a8ea5634e259db64dacde9fc818e16832b51)
+++ src/main/kotlin/platform/mixin/inspection/mixinextras/UnnecessaryMutableLocalInspection.kt	(revision a3b5f894047c10cc740af60334897a157dbd8349)
@@ -25,7 +25,8 @@
 import com.demonwav.mcdev.platform.mixin.handlers.mixinextras.WrapOperationHandler
 import com.demonwav.mcdev.platform.mixin.inspection.MixinInspection
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants
-import com.demonwav.mcdev.platform.mixin.util.MixinConstants.MixinExtras.unwrapLocalRef
+import com.demonwav.mcdev.platform.mixin.util.isLocalRef
+import com.demonwav.mcdev.platform.mixin.util.unwrapLocalRef
 import com.demonwav.mcdev.util.findContainingMethod
 import com.intellij.codeInspection.LocalQuickFixOnPsiElement
 import com.intellij.codeInspection.ProblemsHolder
@@ -42,11 +43,11 @@
 import com.intellij.psi.PsiReferenceExpression
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import com.intellij.psi.search.searches.ReferencesSearch
+import com.intellij.psi.util.PsiTypesUtil
 import com.intellij.psi.util.PsiUtil
 import com.intellij.psi.util.parentOfType
 import com.intellij.util.Processor
 import com.siyeh.ig.psiutils.MethodCallUtils
-import org.jetbrains.plugins.groovy.intentions.style.inference.resolve
 
 class UnnecessaryMutableLocalInspection : MixinInspection() {
     override fun getStaticDescription() = "Unnecessary mutable reference to captured local"
@@ -75,12 +76,13 @@
                 if (!param.hasAnnotation(MixinConstants.MixinExtras.LOCAL)) {
                     continue
                 }
-                val paramType = param.type.resolve()
-                if (paramType?.qualifiedName?.startsWith(MixinConstants.MixinExtras.LOCAL_REF_PACKAGE) != true) {
+                val paramType = param.type
+                if (!param.type.isLocalRef) {
                     continue
                 }
 
-                checkParameter(holder, method, param, i, paramType)
+                val paramClass = PsiTypesUtil.getPsiClass(paramType) ?: continue
+                checkParameter(holder, method, param, i, paramClass)
             }
         }
     }