Merge branch '2016.3' into 2017.1

Author: DenWav

src/main/kotlin/com/demonwav/mcdev/platform/mixin/MixinModuleType.kt

@@ -13,42 +13,19 @@ package com.demonwav.mcdev.platform.mixin
 import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.platform.AbstractModuleType
 import com.demonwav.mcdev.platform.PlatformType
-import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations
 
 object MixinModuleType : AbstractModuleType<MixinModule>("org.spongepowered", "mixin") {
 
     const val ID = "MIXIN_MODULE_TYPE"
 
-    private val IGNORED_ANNOTATIONS = listOf(
-        Annotations.DEBUG,
-        Annotations.FINAL,
-        Annotations.IMPLEMENTS,
-        Annotations.INTERFACE,
-        Annotations.INTRINSIC,
-        Annotations.MIXIN,
-        Annotations.MUTABLE,
-        Annotations.OVERWRITE,
-        Annotations.SHADOW,
-        Annotations.SOFT_OVERRIDE,
-        Annotations.UNIQUE,
-        Annotations.INJECT,
-        Annotations.MODIFY_ARG,
-        Annotations.MODIFY_CONSTANT,
-        Annotations.MODIFY_VARIABLE,
-        Annotations.REDIRECT,
-        Annotations.SURROGATE
-    )
-
-    private val LISTENER_ANNOTATIONS = emptyList<String>()
-
     override fun getPlatformType() = PlatformType.MIXIN
     override fun getIcon() = null
     override fun hasIcon() = false
 
     override fun getId(): String = ID
 
-    override fun getIgnoredAnnotations() = IGNORED_ANNOTATIONS
-    override fun getListenerAnnotations() = LISTENER_ANNOTATIONS
+    override fun getIgnoredAnnotations() = emptyList<String>()
+    override fun getListenerAnnotations() = emptyList<String>()
 
     override fun generateModule(facet: MinecraftFacet) = MixinModule(facet)
 }

src/main/kotlin/com/demonwav/mcdev/platform/mixin/insight/MixinImplicitUsageProvider.kt

@@ -0,0 +1,31 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2017 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mixin.insight
+
+import com.demonwav.mcdev.platform.mixin.util.MixinConstants
+import com.demonwav.mcdev.platform.mixin.util.isShadow
+import com.demonwav.mcdev.util.findAnnotation
+import com.intellij.codeInsight.daemon.ImplicitUsageProvider
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
+import com.intellij.psi.PsiMethod
+
+class MixinImplicitUsageProvider : ImplicitUsageProvider {
+
+    override fun isImplicitUsage(element: PsiElement) = element is PsiMethod && MixinConstants.Annotations.ENTRY_POINTS.any {
+        element.findAnnotation(it) != null
+    }
+
+    private fun isShadow(element: PsiElement) = element is PsiField && element.isShadow
+
+    override fun isImplicitRead(element: PsiElement) = isShadow(element)
+    override fun isImplicitWrite(element: PsiElement) = isShadow(element)
+}

src/main/kotlin/com/demonwav/mcdev/platform/mixin/util/MixinConstants.kt

@@ -51,6 +51,7 @@ object MixinConstants {
         const val SURROGATE = "org.spongepowered.asm.mixin.injection.Surrogate"
 
         @JvmField val METHOD_INJECTORS = listOf(INJECT, MODIFY_ARG, MODIFY_CONSTANT, MODIFY_VARIABLE, REDIRECT)
+        @JvmField val ENTRY_POINTS = listOf(INJECT, MODIFY_ARG, MODIFY_CONSTANT, MODIFY_VARIABLE, REDIRECT, SURROGATE, OVERWRITE)
         @JvmField val MIXIN_ANNOTATIONS = setOf(
             ACCESSOR, AT, DEBUG, FINAL, IMPLEMENTS, INTERFACE, INTRINSIC, MIXIN, MUTABLE, OVERWRITE, SHADOW, SOFT_OVERRIDE, UNIQUE, INJECT,
             INVOKER, MODIFY_ARG, MODIFY_CONSTANT, MODIFY_VARIABLE, REDIRECT, SURROGATE)

src/main/kotlin/com/demonwav/mcdev/platform/mixin/util/Shadow.kt

@@ -28,6 +28,10 @@ import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 import org.jetbrains.annotations.Contract
 
+@get:Contract(pure = true)
+val PsiMember.isShadow
+    get() = findAnnotation(SHADOW) != null
+
 @Contract(pure = true)
 fun PsiMember.findFirstShadowTarget(): PsiMember? {
     val shadow = findAnnotation(SHADOW) ?: return null

src/main/resources/META-INF/plugin.xml

@@ -65,6 +65,7 @@
         <externalProjectDataService implementation="com.demonwav.mcdev.platform.mcp.gradle.McpDataService"/>
 
         <lang.inspectionSuppressor language="JAVA" implementationClass="com.demonwav.mcdev.platform.mixin.inspection.shadow.ShadowNullableInspectionSuppressor"/>
+        <implicitUsageProvider implementation="com.demonwav.mcdev.platform.mixin.insight.MixinImplicitUsageProvider"/>
 
         <!-- Mixin completion -->
         <superMethodsSearch implementation="com.demonwav.mcdev.platform.mixin.search.MixinSoftImplementMethodSuperSearcher"/>