User: rednesto
Date: 30 Aug 24 11:57
Revision: 9a6a180b7bdb3bc1c10c92fa131e7ce9c35385de
Summary:
Fix ignored annotations registration


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

Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision f8786a17527234e025b9a7f4e0e3d0d44c52ae28)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision 9a6a180b7bdb3bc1c10c92fa131e7ce9c35385de)
@@ -142,7 +142,6 @@
     }
 
     private fun register(type: AbstractModuleType<*>): AbstractModule {
-        type.performCreationSettingSetup(module.project)
         val module = type.generateModule(this)
         moduleMap[type] = module
         return module
Index: src/main/kotlin/inspection/PlatformAnnotationEntryPoint.kt
===================================================================
--- src/main/kotlin/inspection/PlatformAnnotationEntryPoint.kt	(revision f8786a17527234e025b9a7f4e0e3d0d44c52ae28)
+++ src/main/kotlin/inspection/PlatformAnnotationEntryPoint.kt	(revision 9a6a180b7bdb3bc1c10c92fa131e7ce9c35385de)
@@ -21,6 +21,7 @@
 package com.demonwav.mcdev.inspection
 
 import com.demonwav.mcdev.asset.MCDevBundle
+import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.codeInspection.reference.EntryPoint
 import com.intellij.codeInspection.reference.RefElement
 import com.intellij.openapi.util.InvalidDataException
@@ -34,8 +35,7 @@
     override fun isEntryPoint(psiElement: PsiElement) = false
     override fun isSelected() = false
     override fun setSelected(selected: Boolean) {}
-    override fun getIgnoreAnnotations() =
-        arrayOf("org.spongepowered.api.event.Listener", "org.bukkit.event.EventHandler")
+    override fun getIgnoreAnnotations() = PlatformType.entries.flatMap { it.type.ignoredAnnotations }.toTypedArray()
 
     @Throws(InvalidDataException::class)
     override fun readExternal(element: Element) {
Index: src/main/kotlin/platform/AbstractModuleType.kt
===================================================================
--- src/main/kotlin/platform/AbstractModuleType.kt	(revision f8786a17527234e025b9a7f4e0e3d0d44c52ae28)
+++ src/main/kotlin/platform/AbstractModuleType.kt	(revision 9a6a180b7bdb3bc1c10c92fa131e7ce9c35385de)
@@ -23,11 +23,8 @@
 import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.insight.generation.ui.EventGenerationPanel
 import com.demonwav.mcdev.util.findContainingClass
-import com.intellij.codeInspection.ex.EntryPointsManager
-import com.intellij.codeInspection.ex.EntryPointsManagerBase
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleUtilCore
-import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -56,17 +53,6 @@
 
     abstract fun generateModule(facet: MinecraftFacet): T
 
-    fun performCreationSettingSetup(project: Project) {
-        if (project.isDisposed) {
-            return
-        }
-        val manager = EntryPointsManager.getInstance(project)
-        val annotations = (manager as? EntryPointsManagerBase)?.ADDITIONAL_ANNOTATIONS as? MutableList<String> ?: return
-        ignoredAnnotations.asSequence()
-            .filter { annotation -> !annotations.contains(annotation) }
-            .forEach { annotations.add(it) }
-    }
-
     open fun getEventGenerationPanel(chosenClass: PsiClass): EventGenerationPanel {
         return EventGenerationPanel(chosenClass)
     }