Merge branch '2021.1' into 2021.2

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.1.3"
+    id("org.jetbrains.intellij") version "1.2.0"
     id("org.cadixdev.licenser") version "0.6.1"
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
@@ -60,6 +60,7 @@ repositories {
     mavenCentral()
     maven("https://repo.denwav.dev/repository/maven-public/")
     maven("https://repo.spongepowered.org/maven")
+    maven("https://www.jetbrains.com/intellij-repository/releases")
     maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
     maven("https://repo.gradle.org/gradle/libs-releases-local/")
     maven("https://maven.extracraftx.com")
@@ -78,6 +79,10 @@ dependencies {
 
     implementation(libs.templateMakerFabric)
 
+    implementation("org.ow2.asm:asm:9.2")
+    implementation("org.ow2.asm:asm-tree:9.2")
+    implementation("org.ow2.asm:asm-analysis:9.2")
+
     jflex(libs.jflex.lib)
     jflexSkeleton("${libs.jflex.skeleton.text()}@skeleton")
     grammarKit(libs.grammarKit)
@@ -86,6 +91,7 @@ dependencies {
     testLibs(libs.test.mixin)
     testLibs("${libs.test.spongeapi.text()}:shaded")
     testLibs("${libs.test.nbt.text()}@nbt")
+    testLibs(project(":mixin-test-data"))
 
     // For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
     // afterEvaluate { println(intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)) }
@@ -106,6 +112,7 @@ intellij {
         "gradle",
         "Groovy",
         "org.toml.lang:$pluginTomlVersion",
+        "ByteCodeViewer",
         // needed dependencies for unit tests
         "properties",
         "junit"
@@ -184,6 +191,7 @@ tasks.test {
             systemProperty("testLibs.${it.name}", it.file.absolutePath)
         }
     }
+    systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true")
     if (JavaVersion.current().isJava9Compatible) {
         jvmArgs(
             "--add-opens", "java.base/java.io=ALL-UNNAMED",

buildSrc/src/main/kotlin/util.kt

@@ -8,7 +8,6 @@
  * MIT License
  */
 
-import java.io.File
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.tasks.JavaExec

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ annotations = "org.jetbrains:annotations:20.1.0"
 
 # Testing
 test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50"
-test-mixin = "org.spongepowered:mixin:0.7-SNAPSHOT"
+test-mixin = "org.spongepowered:mixin:0.8-SNAPSHOT"
 test-spongeapi = "org.spongepowered:spongeapi:7.0.0"
 test-nbt = "com.demonwav.mcdev:all-types-nbt:1.0"
 

mixin-test-data/build.gradle.kts

@@ -0,0 +1,17 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+plugins {
+    java
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.debugOptions.debugLevel = "vars"
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/accessor/BaseMixin.java

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.accessor;
+
+public class BaseMixin {
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/accessor/BaseMixinInterface.java

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.accessor;
+
+public interface BaseMixinInterface {
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/ambiguousReference/MixedIn.java

@@ -0,0 +1,22 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.ambiguousReference;
+
+public class MixedIn {
+    public void method() {
+    }
+
+    public void method(String string) {
+    }
+
+    public void uniqueMethod(String string) {
+    }
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class GenericOneParam<T> {
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class GenericTwoParams<T, U> {
+}

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

@@ -0,0 +1,30 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureFix;
+
+import java.util.List;
+import java.util.Map;
+
+public class MixedInGeneric {
+    public GenericOneParam<String> genericMethod(
+            String noGenerics,
+            GenericOneParam<String> oneParam,
+            GenericTwoParams<String, Integer> twoParams,
+            GenericOneParam<GenericOneParam<String>> nestedParam,
+            Map<String, List<Map.Entry<String, Map<Integer, int[]>>>[]> pleaseJava
+    ) {
+        return null;
+    }
+
+    public Map.Entry<String, List<Map.Entry<String, Map<Integer, int[]>>>[]> returnComplex() {
+        return null;
+    }
+}

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

@@ -0,0 +1,25 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInOuter {
+    public class MixedInInner {
+        public MixedInInner() {
+        }
+
+        public MixedInInner(String string) {
+        }
+    }
+
+    public MixedInInner methodWithInnerType(MixedInInner param) {
+        return null;
+    }
+}

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

@@ -0,0 +1,17 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureFix;
+
+public class MixedInSimple {
+    public void simpleMethod(String string, int i) {
+        int testInt = Integer.parseInt("FF", 16);
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/invalidInjectorMethodSignatureInspection/MixedInOuter.java

@@ -0,0 +1,46 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.invalidInjectorMethodSignatureInspection;
+
+import java.lang.String;
+
+public class MixedInOuter {
+    public MixedInOuter() {
+        this(method1());
+        method2();
+    }
+
+    public MixedInOuter(String arg) {
+    }
+
+    private static String method1() {
+        return null;
+    }
+
+    private static void method2() {
+    }
+
+    public class MixedInInner {
+        public MixedInInner() {
+        }
+
+        public MixedInInner(String string) {
+        }
+    }
+
+    public static class MixedInStaticInner {
+        public MixedInStaticInner() {
+        }
+
+        public MixedInStaticInner(String string) {
+        }
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/multipleTarget/MixedIn.java

@@ -0,0 +1,19 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.multipleTarget;
+
+public class MixedIn {
+    public void method1() {
+    }
+
+    public void method2() {
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/shadow/MixinBase.java

@@ -0,0 +1,55 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.shadow;
+
+public class MixinBase {
+    private MixinBase() {}
+
+    // Static
+    private static final String privateStaticFinalString = "";
+    private static String privateStaticString = "";
+
+    protected static final String protectedStaticFinalString = "";
+    protected static String protectedStaticString = "";
+
+    static final String packagePrivateStaticFinalString = "";
+    static String packagePrivateStaticString = "";
+
+    public static final String publicStaticFinalString = "";
+    public static String publicStaticString = "";
+
+    // Non-static
+    private final String privateFinalString = "";
+    private String privateString = "";
+
+    protected final String protectedFinalString = "";
+    protected String protectedString = "";
+
+    final String packagePrivateFinalString = "";
+    String packagePrivateString = "";
+
+    public final String publicFinalString = "";
+    public String publicString = "";
+
+    // Bad shadows
+    protected String wrongAccessor = "";
+    protected final String noFinal = "";
+
+    public final String twoIssues = "";
+
+    private static String privateStaticMethod() {
+        return null;
+    }
+
+    private String privateMethod() {
+        return null;
+    }
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/superClass/DemonWav.java

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.superClass;
+
+public class DemonWav extends Entity {
+}

mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/superClass/Entity.java

@@ -0,0 +1,14 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.mixintestdata.superClass;
+
+public class Entity {
+}