From 440282069cba24a0fb6deeb1e075a68bf7054808 Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Mon, 22 Dec 2025 15:53:14 +0000 Subject: [PATCH] Fix: Allow Local classes and inner classes in mixins. They in fact are allowed. --- .../mixin/inspection/MixinInnerClassInspection.kt | 15 --------------- src/test/kotlin/platform/mixin/InnerClassTest.kt | 6 +++--- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/main/kotlin/platform/mixin/inspection/MixinInnerClassInspection.kt b/src/main/kotlin/platform/mixin/inspection/MixinInnerClassInspection.kt index 264f2c992..fcf445c9e 100644 --- a/src/main/kotlin/platform/mixin/inspection/MixinInnerClassInspection.kt +++ b/src/main/kotlin/platform/mixin/inspection/MixinInnerClassInspection.kt @@ -29,7 +29,6 @@ import com.intellij.psi.PsiAnonymousClass import com.intellij.psi.PsiClass import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiModifier -import com.intellij.psi.util.PsiUtil import com.intellij.psi.util.parentOfType class MixinInnerClassInspection : MixinInspection() { @@ -41,15 +40,6 @@ class MixinInnerClassInspection : MixinInspection() { private class Visitor(private val holder: ProblemsHolder) : JavaElementVisitor() { override fun visitClass(psiClass: PsiClass) { - if (psiClass.containingClass == null && PsiUtil.isLocalClass(psiClass) && psiClass.parentOfType()?.isMixin == true) { - holder.registerProblem( - psiClass.nameIdentifier ?: psiClass, - "Local classes are not allowed inside mixins" - ) - - return - } - val outerClass = psiClass.containingClass ?: return if (!outerClass.isMixin) { if (outerClass is PsiAnonymousClass && outerClass.parentOfType()?.isMixin == true) { @@ -72,11 +62,6 @@ class MixinInnerClassInspection : MixinInspection() { QuickFixFactory.getInstance().createModifierListFix(psiClass, PsiModifier.STATIC, true, false), ) } - } else { - holder.registerProblem( - psiClass.nameIdentifier ?: psiClass, - "Inner classes are only allowed if they are also @Mixin classes" - ) } } diff --git a/src/test/kotlin/platform/mixin/InnerClassTest.kt b/src/test/kotlin/platform/mixin/InnerClassTest.kt index 9a8a737a6..db758ef9c 100644 --- a/src/test/kotlin/platform/mixin/InnerClassTest.kt +++ b/src/test/kotlin/platform/mixin/InnerClassTest.kt @@ -62,8 +62,8 @@ class InnerClassTest : BaseMixinTest() { }; } - private static void localClassBad() { - class Local { + private static void localClassOk() { + class Local { } } @@ -77,7 +77,7 @@ class InnerClassTest : BaseMixinTest() { } - class VeryBadInnerClass { + class InnerClassOk { }