Merge branch '2024.2' into 2024.3

Author: Earthcomputer

.editorconfig

@@ -1,3 +1,6 @@
 [*.{kt,kts}]
 max_line_length=120
 ij_kotlin_imports_layout=*
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+insert_final_newline = true

build.gradle.kts

@@ -90,6 +90,7 @@ dependencies {
         exclude(group = "org.ow2.asm", module = "asm-debug-all")
     }
     testLibs(libs.mixinExtras.common)
+    implementation(libs.jgraphx)
 
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)

gradle/libs.versions.toml

@@ -34,7 +34,8 @@ changelog-plugin = { module = "org.jetbrains.changelog:org.jetbrains.changelog.g
 coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
 mappingIo = "net.fabricmc:mapping-io:0.2.1"
-mixinExtras-expressions = "io.github.llamalad7:mixinextras-expressions:0.0.4"
+mixinExtras-expressions = "io.github.llamalad7:mixinextras-expressions:0.0.6"
+jgraphx = "com.github.vlsi.mxgraph:jgraphx:4.2.2"
 
 # GrammarKit
 jflex-lib = "org.jetbrains.idea:jflex:1.7.0-b7f882a"

src/main/kotlin/platform/mixin/MixinModule.kt

@@ -21,14 +21,10 @@
 package com.demonwav.mcdev.platform.mixin
 
 import com.demonwav.mcdev.facet.MinecraftFacet
-import com.demonwav.mcdev.facet.MinecraftFacetDetector
 import com.demonwav.mcdev.platform.AbstractModule
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.mixin.config.MixinConfig
 import com.demonwav.mcdev.platform.mixin.config.MixinConfigFileType
-import com.demonwav.mcdev.platform.mixin.framework.MIXIN_LIBRARY_KIND
-import com.demonwav.mcdev.util.SemanticVersion
-import com.demonwav.mcdev.util.nullable
 import com.intellij.json.psi.JsonFile
 import com.intellij.json.psi.JsonObject
 import com.intellij.openapi.project.Project
@@ -40,14 +36,6 @@ import com.intellij.psi.search.GlobalSearchScope
 import javax.swing.Icon
 
 class MixinModule(facet: MinecraftFacet) : AbstractModule(facet) {
-    val mixinVersion by nullable {
-        var version = MinecraftFacetDetector.getLibraryVersions(facet.module)[MIXIN_LIBRARY_KIND]
-            ?: return@nullable null
-        // fabric mixin uses the format "0.10.4+mixin.0.8.4", return the original string otherwise.
-        version = version.substringAfter("+mixin.")
-        SemanticVersion.parse(version)
-    }
-
     override val moduleType = MixinModuleType
     override val type = PlatformType.MIXIN
     override val icon: Icon? = null

src/main/kotlin/platform/mixin/action/GenerateAccessorAction.kt

@@ -23,6 +23,7 @@ package com.demonwav.mcdev.platform.mixin.action
 import com.demonwav.mcdev.platform.mixin.MixinModuleType
 import com.intellij.codeInsight.FileModificationService
 import com.intellij.codeInsight.generation.actions.BaseGenerateAction
+import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.editor.Editor
@@ -34,11 +35,21 @@ import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.util.PsiUtilBase
 
 class GenerateAccessorAction : BaseGenerateAction(GenerateAccessorHandler()) {
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        val editor = getEditor(e.dataContext, project, false)
+        performAction(project, editor)
+    }
+
+    override fun actionPerformedImpl(project: Project, editor: Editor?) {
+        performAction(project, editor)
+    }
+
     /**
      * Copied from [com.intellij.codeInsight.actions.CodeInsightAction.actionPerformedImpl]
      * except that it calls the [GenerateAccessorHandler.customInvoke] method instead of the normal one
      */
-    override fun actionPerformedImpl(project: Project, editor: Editor?) {
+    private fun performAction(project: Project, editor: Editor?) {
         if (editor == null) {
             return
         }

src/main/kotlin/platform/mixin/completion/MixinCompletionContributor.kt

@@ -32,7 +32,8 @@ import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.completion.JavaCompletionContributor
 import com.intellij.codeInsight.completion.JavaCompletionSorting
 import com.intellij.codeInsight.completion.LegacyCompletionContributor
-import com.intellij.codeInsight.completion.PrioritizedLookupElement
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiExpression
 import com.intellij.psi.PsiJavaReference
@@ -58,6 +59,9 @@ class MixinCompletionContributor : CompletionContributor() {
             return
         }
 
+        // Run all the other contributors first
+        result.runRemainingContributors(parameters, result::passResult)
+
         val superMixin = psiClass.superClass?.takeIf { it.isWritable && it.isMixin }
 
         val javaResult = JavaCompletionSorting.addJavaSorting(parameters, result)
@@ -107,8 +111,12 @@ class MixinCompletionContributor : CompletionContributor() {
 
             // Process methods and fields from target class
             val elements = findShadowTargets(psiClass, start, superMixin != null)
+                .filter {
+                    val name = it.name
+                    StringUtil.isJavaIdentifier(name) && prefixMatcher.prefixMatches(name)
+                }
+                .onEach { ProgressManager.checkCanceled() }
                 .map { it.createLookupElement(psiClass.project) }
-                .filter { prefixMatcher.prefixMatches(it) }
                 .filter(filter, position)
                 .toList()
 

src/main/kotlin/platform/mixin/expression/MEExpressionAnnotator.kt

@@ -326,9 +326,9 @@ class MEExpressionAnnotator : Annotator {
     }
 
     private fun AnnotationBuilder.withDefinitionFix(name: MEName) =
-        withFix(AddDefinitionInspection(name))
+        withFix(AddDefinitionFix(name))
 
-    private class AddDefinitionInspection(name: MEName) : LocalQuickFixAndIntentionActionOnPsiElement(name) {
+    private class AddDefinitionFix(name: MEName) : LocalQuickFixAndIntentionActionOnPsiElement(name) {
         private val id = name.text
 
         override fun getFamilyName(): String = "Add @Definition"
@@ -355,9 +355,9 @@ class MEExpressionAnnotator : Annotator {
                 project,
                 startElement,
                 id,
-                "dummy"
+                "dummy = \"\""
             ) ?: return
-            val dummy = annotation.findAttribute("dummy") as? PsiElement ?: return
+            val dummy = annotation.parameterList.attributes.firstOrNull { it.name == "dummy" } ?: return
             val hostEditor = InjectedLanguageEditorUtil.getTopLevelEditor(editor)
             hostEditor.caretModel.moveToOffset(dummy.textOffset)
             PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(hostEditor.document)

src/main/kotlin/platform/mixin/expression/MEExpressionMatchUtil.kt

@@ -263,6 +263,8 @@ object MEExpressionMatchUtil {
         insns: Iterable<VirtualInsn>,
         contextType: ExpressionContext.Type,
         forCompletion: Boolean,
+        crossinline reportMatchStatus: (FlowValue, Expression, Boolean) -> Unit = { _, _, _ -> },
+        crossinline reportPartialMatch: (FlowValue, Expression) -> Unit = { _, _ -> },
         callback: (ExpressionMatch) -> Unit
     ) {
         for (insn in insns) {
@@ -283,6 +285,14 @@ object MEExpressionMatchUtil {
                     // Our maps are per-injector anyway, so this is just a normal decoration.
                     decorations.getOrPut(VirtualInsn(insn), ::mutableMapOf)[key] = value
                 }
+
+                override fun reportMatchStatus(node: FlowValue, expr: Expression, matched: Boolean) {
+                    reportMatchStatus.invoke(node, expr, matched)
+                }
+
+                override fun reportPartialMatch(node: FlowValue, expr: Expression) {
+                    reportPartialMatch.invoke(node, expr)
+                }
             }
 
             val flow = flows[insn] ?: continue

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

@@ -0,0 +1,84 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2025 minecraft-dev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, version 3.0 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.demonwav.mcdev.platform.mixin.expression.gui
+
+import com.intellij.openapi.editor.colors.EditorColorsManager
+import com.intellij.openapi.editor.colors.EditorFontType
+import com.intellij.ui.JBColor
+import com.intellij.util.ui.JBUI
+import com.intellij.util.ui.UIUtil
+import com.mxgraph.util.mxConstants
+import java.awt.Color
+
+object DiagramStyles {
+    val DEFAULT_NODE
+        get() = mapOf(
+            mxConstants.STYLE_FONTFAMILY to CURRENT_EDITOR_FONT.family,
+            mxConstants.STYLE_ROUNDED to true,
+            mxConstants.STYLE_FILLCOLOR to JBUI.CurrentTheme.Button.buttonColorStart().hexString,
+            mxConstants.STYLE_FONTCOLOR to UIUtil.getLabelForeground().hexString,
+            mxConstants.STYLE_STROKECOLOR to JBUI.CurrentTheme.Button.buttonOutlineColorStart(false).hexString,
+            mxConstants.STYLE_ALIGN to mxConstants.ALIGN_CENTER,
+            mxConstants.STYLE_VERTICAL_ALIGN to mxConstants.ALIGN_TOP,
+            mxConstants.STYLE_SHAPE to mxConstants.SHAPE_LABEL,
+            mxConstants.STYLE_SPACING to 5,
+            mxConstants.STYLE_SPACING_TOP to 3,
+        )
+    val DEFAULT_EDGE
+        get() = mapOf(
+            mxConstants.STYLE_STROKECOLOR to UIUtil.getFocusedBorderColor().hexString,
+        )
+    val LINE_NUMBER = mapOf(
+        mxConstants.STYLE_FONTSIZE to "16",
+        mxConstants.STYLE_STROKECOLOR to "none",
+        mxConstants.STYLE_FILLCOLOR to "none",
+    )
+    val SEARCH_HIGHLIGHT
+        get() = mapOf(
+            mxConstants.STYLE_STROKECOLOR to UIUtil.getFocusedBorderColor().hexString,
+            mxConstants.STYLE_STROKEWIDTH to "2",
+        )
+    val IGNORED = mapOf(
+        mxConstants.STYLE_OPACITY to 20,
+        mxConstants.STYLE_TEXT_OPACITY to 20,
+        mxConstants.STYLE_STROKE_OPACITY to 20,
+        mxConstants.STYLE_FILL_OPACITY to 20,
+    )
+    val FAILED
+        get() = mapOf(
+            mxConstants.STYLE_STROKECOLOR to JBColor.red.hexString,
+            mxConstants.STYLE_STROKEWIDTH to "3.5",
+        )
+    val PARTIAL_MATCH
+        get() = mapOf(
+            mxConstants.STYLE_STROKECOLOR to JBColor.orange.hexString,
+            mxConstants.STYLE_STROKEWIDTH to "2.5",
+        )
+    val SUCCESS
+        get() = mapOf(
+            mxConstants.STYLE_STROKECOLOR to JBColor.green.hexString,
+            mxConstants.STYLE_STROKEWIDTH to "1.5",
+        )
+    val CURRENT_EDITOR_FONT
+        get() = EditorColorsManager.getInstance().globalScheme.getFont(EditorFontType.PLAIN)
+}
+
+private val Color.hexString get() = "#%06X".format(rgb)