User: joe
Date: 20 Jul 25 11:37
Revision: 80ecf2277acea2cc9dc78e6cd407bd2604f9d757
Summary:
Merge branch '2024.2' into 2024.3


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=10110&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688)
+++ build.gradle.kts	(revision 80ecf2277acea2cc9dc78e6cd407bd2604f9d757)
@@ -90,6 +90,7 @@
         exclude(group = "org.ow2.asm", module = "asm-debug-all")
     }
     testLibs(libs.mixinExtras.common)
+    implementation(libs.jgraphx)
 
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688)
+++ gradle/libs.versions.toml	(revision 80ecf2277acea2cc9dc78e6cd407bd2604f9d757)
@@ -34,7 +34,8 @@
 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"
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 4fd58b49bd7c3624f95f12c29c9e173a2ebd4688)
+++ src/main/resources/META-INF/plugin.xml	(revision 80ecf2277acea2cc9dc78e6cd407bd2604f9d757)
@@ -781,6 +781,7 @@
                                  implementationClass="com.demonwav.mcdev.platform.mixin.expression.psi.MENameElementManipulator"/>
         <lang.findUsagesProvider language="MEExpression"
                                  implementationClass="com.demonwav.mcdev.platform.mixin.expression.reference.MEExpressionFindUsagesProvider"/>
+        <referencesSearch implementation="com.demonwav.mcdev.platform.mixin.expression.reference.MEDefinitionReferencesSearcher"/>
         <lang.refactoringSupport language="MEExpression"
                                  implementationClass="com.demonwav.mcdev.platform.mixin.expression.MEExpressionRefactoringSupport"/>
         <completion.contributor language="MEExpression"
@@ -1294,6 +1295,14 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.mixinextras.InjectLocalCaptureReplaceWithLocalInspection"/>
+        <localInspection displayName="INVOKE_ASSIGN can be replaced with expression"
+                         shortName="InvokeAssignCanReplacedWithExpression"
+                         groupName="Mixin"
+                         language="JAVA"
+                         enabledByDefault="true"
+                         level="WARNING"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.platform.mixin.inspection.mixinextras.InvokeAssignReplaceWithExpressionInspection"/>
         <!--endregion-->
 
         <!--region Overwrite Inspections -->
@@ -1543,6 +1552,11 @@
                 description="Generate an accessor for the selected member">
             <add-to-group group-id="GenerateGroup" anchor="last"/>
         </action>
+        <action class="com.demonwav.mcdev.platform.mixin.expression.gui.MEShowFlowAction"
+                text="Show MixinExtras Flow Diagram" description="Visualize MixinExtras Expression flow as a diagram"
+                popup="true">
+            <add-to-group group-id="EditorPopupMenu" anchor="last"/>
+        </action>
         <action class="com.demonwav.mcdev.platform.mcp.actions.FindSrgMappingAction" id="FindSrgMappingAction"
                 text="Get SRG Name"
                 description="Find the associated SRG mapping for this element">