Feature/method signature intersection

gradle/libs.versions.toml

@@ -68,7 +68,7 @@ fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", versio
 sentry = "io.sentry:sentry:8.37.1"
 
 # Testing
-test-mixin = "org.spongepowered:mixin:0.8.5"
+test-mixin = "net.fabricmc:sponge-mixin:0.17.4+mixin.0.8.7"
 test-spigotapi = "org.spigotmc:spigot-api:1.21.11-R0.2-SNAPSHOT"
 test-bungeecord = "net.md-5:bungeecord-api:1.21-R0.4"
 test-spongeapi = "org.spongepowered:spongeapi:7.4.0"

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInComplex.java

@@ -0,0 +1,66 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInComplex {
+    public void method1(String arg) {
+        int local1 = 0;
+        CharSequence local2 = null;
+        char local3 = 'a';
+        Integer local4 = 10;
+    }
+
+    public void method2(int arg) {
+        int local1 = 0;
+    }
+
+    public String method3(Integer arg) {
+        return arg.toString();
+    }
+
+    public Integer method4() {
+        return 1;
+    }
+
+    public void method5(CharSequence arg) {
+        int local1 = 0;
+        String local2 = null;
+        int local3 = 0;
+        int local4 = 0;
+        char local5 = 0;
+        char local6 = 0;
+    }
+
+    public void method6(CharSequence arg) {
+        int local1 = 0;
+        String local2 = null;
+        int local3 = 0;
+        int local4 = 0;
+        char local5 = 0;
+        short local6 = 0;
+    }
+
+    public void method7(char a) {
+    }
+
+    public void method8(short a) {
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyArg.java

@@ -0,0 +1,38 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInModifyArg {
+   public void caller(Object obj) {
+        callee1("hello", 1);
+        callee2('a', (short) 3, 4);
+        callee3(1, 2, 3);
+    }
+
+    private static void callee1(String x, int y) {
+    }
+
+    private static void callee2(char w, short x, int y) {
+    }
+
+    private static void callee3(int a, int b, int c) {
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyConstant.java

@@ -0,0 +1,37 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInModifyConstant {
+    public void method1(Class<?> arg) {
+        System.out.println(42);
+        System.out.println(101);
+        System.out.println(Long.class);
+        System.out.println((Object) 5 instanceof Integer);
+        System.out.println("hello");
+    }
+
+    public void method2(String arg) {
+        System.out.println(Long.class);
+        System.out.println((Object) 5 instanceof Integer);
+        System.out.println((Object) null);
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyExpressionValue.java

@@ -0,0 +1,57 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInModifyExpressionValue {
+    public void method1() {
+        System.out.println(42);
+        System.out.println(101);
+        System.out.println(callee1());
+        System.out.println(callee2());
+        System.out.println(callee5());
+    }
+
+    public void method2(String a, long b) {
+        System.out.println('a');
+        System.out.println(callee3());
+        System.out.println(callee4());
+    }
+
+    private static char callee1() {
+        return 'a';
+    }
+
+    private static int callee2() {
+        return 1;
+    }
+
+    private static Long[] callee3() {
+        return new Long[0];
+    }
+
+    private static Double[] callee4() {
+        return new Double[0];
+    }
+
+    private static short callee5() {
+        return (short) 1;
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyReceiver.java

@@ -0,0 +1,45 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public abstract class MixedInModifyReceiver implements Comparable<MixedInModifyReceiver> {
+    public String test;
+    public char test2;
+
+    public void caller(char c) {
+        callee1("hello", 1);
+        callee2('a', (short) 3, 4);
+        callee3(1, 2, 3);
+        this.test = "hello";
+        this.test2 = 'a';
+        System.out.println(this.test2);
+        System.out.println(Integer.valueOf(5).longValue());
+    }
+
+    private void callee1(String x, int y) {
+    }
+
+    private void callee2(char w, short x, int y) {
+    }
+
+    private void callee3(int a, int b, int c) {
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyReturnValue.java

@@ -0,0 +1,43 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInModifyReturnValue {
+    public String method1() {
+        return "a";
+    }
+
+    public Integer method2() {
+        return 2;
+    }
+
+    public static Long method3() {
+        return 3L;
+    }
+
+    public int method4(String a, int b) {
+        return b;
+    }
+
+    public char method5(String a, short b) {
+        return (char) b;
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureFix/MixedInModifyVariable.java

@@ -0,0 +1,41 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2026 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.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInModifyVariable {
+    public void method1(String arg, Object arg2) {
+        int local1 = 0;
+        CharSequence local2 = null;
+        char local3 = 'a';
+        Integer local4 = 10;
+    }
+
+    public void method2(int arg) {
+        int local1 = 0;
+    }
+
+    public void method3(CharSequence arg) {
+        int local1 = 0;
+        String local2 = null;
+        int local3 = 0;
+        int local4 = 0;
+    }
+}