Skip to content

Commit f0be6da

Browse files
committed
Move non-private static error to the access modifier (when there is one)
1 parent 75c524e commit f0be6da

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/kotlin/platform/mixin/inspection/StaticMemberInspection.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.INVOKER
2525
import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.OVERWRITE
2626
import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SHADOW
2727
import com.demonwav.mcdev.platform.mixin.util.isMixin
28+
import com.demonwav.mcdev.util.findKeyword
2829
import com.intellij.codeInsight.intention.QuickFixFactory
2930
import com.intellij.codeInspection.ProblemsHolder
3031
import com.intellij.psi.JavaElementVisitor
@@ -33,6 +34,7 @@ import com.intellij.psi.PsiField
3334
import com.intellij.psi.PsiMember
3435
import com.intellij.psi.PsiMethod
3536
import com.intellij.psi.PsiModifier
37+
import org.jetbrains.kotlin.j2k.accessModifier
3638

3739
class StaticMemberInspection : MixinInspection() {
3840

@@ -55,7 +57,7 @@ class StaticMemberInspection : MixinInspection() {
5557
private fun visitMember(member: PsiMember) {
5658
if (isProblematic(member)) {
5759
holder.registerProblem(
58-
member,
60+
member.modifierList?.findKeyword(member.accessModifier()) ?: member,
5961
"Non-private static members are not allowed in Mixin classes",
6062
QuickFixFactory.getInstance().createModifierListFix(member, PsiModifier.PRIVATE, true, false),
6163
)

0 commit comments

Comments
 (0)