Merge branch '2026.1' into 2026.2

Author: Earthcomputer

changelog.md

@@ -1,5 +1,13 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.21]
+
+### Fixed
+
+- Fixed decompile button not working for Fabric and VanillaGradle projects
+- Support debugging interpolated MixinExtras expression strings
+- Fixed shadow warning on abstract enum constructors
+
 ## [1.8.20]
 
 ### Added

create_release.py

@@ -17,7 +17,7 @@
 import sys
 from typing import List, Tuple
 
-BRANCHES=["2025.2", "2025.3", "2026.1", "2026.2"]
+BRANCHES=["2025.3", "2026.1", "2026.2"]
 
 def check_file_contains_version(path: str, version: str) -> bool:
     try:

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
 
 ideaVersionName = 2026.2
 
-coreVersion = 1.8.20
+coreVersion = 1.8.21
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false

readme.md

@@ -31,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.19-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.21-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/main/kotlin/platform/mixin/expression/gui/FlowDiagram.kt

@@ -29,7 +29,7 @@ import com.intellij.openapi.progress.checkCanceled
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.pom.Navigatable
-import com.intellij.psi.PsiLiteralExpression
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiModifierList
 import com.intellij.psi.SmartPointerManager
 import com.llamalad7.mixinextras.expression.impl.point.ExpressionContext
@@ -106,7 +106,7 @@ class FlowDiagram(
 
     fun populateMatchStatuses(
         module: Module,
-        currentStringLit: PsiLiteralExpression,
+        currentStringLit: PsiElement,
         currentModifierList: PsiModifierList
     ) {
         val stringRef = SmartPointerManager.getInstance(module.project).createSmartPsiElementPointer(currentStringLit)

src/main/kotlin/platform/mixin/expression/gui/MEShowFlowAction.kt

@@ -20,19 +20,18 @@
 
 package com.demonwav.mcdev.platform.mixin.expression.gui
 
-import com.demonwav.mcdev.platform.mixin.expression.psi.MEExpressionFile
 import com.demonwav.mcdev.platform.mixin.handlers.InjectorAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.reference.MethodReference
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
+import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.findClassNodeByPsiClass
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.demonwav.mcdev.platform.mixin.util.mixinTargets
 import com.demonwav.mcdev.platform.mixin.util.shortDescString
 import com.demonwav.mcdev.platform.mixin.util.shortName
 import com.demonwav.mcdev.util.descriptor
 import com.demonwav.mcdev.util.ifEmpty
-import com.intellij.lang.injection.InjectedLanguageManager
 import com.intellij.lang.java.JavaLanguage
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
@@ -43,11 +42,16 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
+import com.intellij.psi.PsiArrayInitializerMemberValue
 import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiLiteralExpression
 import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiNameValuePair
+import com.intellij.psi.util.isAncestor
 import com.intellij.psi.util.parentOfType
+import com.intellij.psi.util.parents
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LineNumberNode
 import org.objectweb.asm.tree.MethodNode
@@ -125,13 +129,8 @@ class MEShowFlowAction : AnAction() {
 
         fun resolveExpressionTarget(): Sequence<Resolved> {
             val module = e.getData(LangDataKeys.MODULE) ?: return emptySequence()
-            val string = element.parentOfType<PsiLiteralExpression>() ?: return emptySequence()
+            val string = findExpressionString(element) ?: return emptySequence()
             val modifierList = string.parentOfType<PsiMethod>()?.modifierList ?: return emptySequence()
-            if (InjectedLanguageManager.getInstance(project).getInjectedPsiFiles(string).orEmpty()
-                    .none { it.first is MEExpressionFile }
-            ) {
-                return emptySequence()
-            }
             val (injectorAnnotation, injector) =
                 modifierList.annotations.firstNotNullOfOrNull { ann ->
                     (MixinAnnotationHandler.forMixinAnnotation(ann, project) as? InjectorAnnotationHandler)
@@ -158,6 +157,23 @@ class MEShowFlowAction : AnAction() {
         }
     }
 
+    private fun findExpressionString(anchor: PsiElement): PsiElement? {
+        val nameValue = anchor.parentOfType<PsiNameValuePair>() ?: return null
+        if (nameValue.name != "value" && nameValue.name != null) {
+            // Wrong attribute
+            return null
+        }
+        if (anchor.parentOfType<PsiMethod>()?.modifierList?.hasAnnotation(MixinConstants.MixinExtras.EXPRESSION) != true) {
+            // Not an Expression
+            return null
+        }
+        return when (val value = nameValue.value) {
+            null -> null
+            is PsiArrayInitializerMemberValue -> value.initializers.firstOrNull { it.isAncestor(anchor) }
+            else -> value.takeIf { it.isAncestor(anchor) }
+        }
+    }
+
     private data class Resolved(val clazz: ClassNode, val method: MethodNode, val action: (FlowDiagram) -> Unit = {}) {
         override fun toString() = "${clazz.shortName}::${method.name}${shortDescString(method.desc)}"
     }

src/main/kotlin/platform/mixin/inspection/overwrite/OverwriteModifiersInspection.kt

@@ -24,6 +24,7 @@ import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.OVERWRITE
 import com.demonwav.mcdev.platform.mixin.util.accessLevel
+import com.demonwav.mcdev.platform.mixin.util.bytecodeFriendlyAccessLevel
 import com.demonwav.mcdev.platform.mixin.util.findStubMethod
 import com.demonwav.mcdev.platform.mixin.util.hasModifier
 import com.demonwav.mcdev.platform.mixin.util.internalNameToShortName
@@ -55,7 +56,7 @@ class OverwriteModifiersInspection : OverwriteInspection() {
 
         // Check access modifiers
         val targetAccessLevel = target.method.accessLevel
-        val currentAccessLevel = PsiUtil.getAccessLevel(modifierList)
+        val currentAccessLevel = modifierList.bytecodeFriendlyAccessLevel()
         if (currentAccessLevel < targetAccessLevel) {
             val targetModifier = PsiUtil.getAccessModifier(targetAccessLevel)
             val currentModifier = PsiUtil.getAccessModifier(currentAccessLevel)

src/main/kotlin/platform/mixin/inspection/shadow/ShadowModifiersInspection.kt

@@ -28,6 +28,7 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.FINAL
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
 import com.demonwav.mcdev.platform.mixin.util.accessLevel
+import com.demonwav.mcdev.platform.mixin.util.bytecodeFriendlyAccessLevel
 import com.demonwav.mcdev.util.findKeyword
 import com.intellij.codeInsight.intention.AddAnnotationModCommandAction
 import com.intellij.codeInsight.intention.QuickFixFactory
@@ -88,7 +89,7 @@ class ShadowModifiersInspection : MixinInspection() {
 
             // Check access level
             val targetAccessLevel = getTargetAccessLevel(target, shadowModifierList)
-            val shadowAccessLevel = PsiUtil.getAccessLevel(shadowModifierList)
+            val shadowAccessLevel = shadowModifierList.bytecodeFriendlyAccessLevel()
             if (targetAccessLevel != shadowAccessLevel) {
                 val targetModifier = PsiUtil.getAccessModifier(targetAccessLevel)
                 val shadowModifier = PsiUtil.getAccessModifier(shadowAccessLevel)

src/main/kotlin/platform/mixin/util/Mixin.kt

@@ -45,6 +45,9 @@ import com.intellij.psi.PsiDisjunctionType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIntersectionType
 import com.intellij.psi.PsiLiteralExpression
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import com.intellij.psi.PsiModifierList
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiType
@@ -53,6 +56,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.InheritanceUtil
 import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.psi.util.PsiTypesUtil
+import com.intellij.psi.util.PsiUtil
 import com.intellij.psi.util.TypeConversionUtil
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
@@ -319,3 +323,20 @@ fun PsiElement.hasNamedLocalVariables(className: String): Boolean {
 
     return true
 }
+
+@PsiUtil.AccessLevel
+fun PsiModifierList.bytecodeFriendlyAccessLevel(): Int {
+    val originalLevel = PsiUtil.getAccessLevel(this)
+
+    val parent = this.parent
+
+    // Constructors are package-local in abstract enums in the bytecode, but not in source
+    if (parent is PsiMethod && parent.isConstructor) {
+        val containingClass = parent.containingClass
+        if (containingClass?.isEnum == true && containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
+            return PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL
+        }
+    }
+
+    return originalLevel
+}