Move most initialization code away from components

DenWav · DenWav · commit ecf13af19ca0 · 2018-09-08T18:24:40.000-05:00
Since this plugin is Facet based, we should be using the Facet lifecycle
for handling init and depose of any features instead of components.
diff --git a/src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacet.kt b/src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacet.kt
@@ -90,10 +90,15 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
         updateRoots()
 
         // Add modules which are new
+        val newlyEnabled = mutableListOf<AbstractModule>()
         allEnabled
             .map { it.type }
             .filter { !moduleMap.containsKey(it) }
-            .forEach(this::register)
+            .forEach {
+                newlyEnabled += register(it)
+            }
+
+        newlyEnabled.forEach(AbstractModule::init)
 
         ProjectView.getInstance(module.project).refresh()
     }
@@ -115,9 +120,11 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
             }
     }
 
-    private fun register(type: AbstractModuleType<*>) {
+    private fun register(type: AbstractModuleType<*>): AbstractModule {
         type.performCreationSettingSetup(module.project)
-        moduleMap[type] = type.generateModule(this)
+        val module = type.generateModule(this)
+        moduleMap[type] = module
+        return module
     }
 
     val modules get() = moduleMap.values
diff --git a/src/main/kotlin/com/demonwav/mcdev/i18n/I18nFileListener.kt b/src/main/kotlin/com/demonwav/mcdev/i18n/I18nFileListener.kt
@@ -11,32 +11,16 @@
 package com.demonwav.mcdev.i18n
 
 import com.demonwav.mcdev.i18n.lang.I18nFileType
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.ApplicationComponent
-import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.newvfs.BulkFileListener
 import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import com.intellij.ui.EditorNotifications
 
-class I18nFileListener : ApplicationComponent, BulkFileListener {
-    private val connection = ApplicationManager.getApplication().messageBus.connect()
-
-    override fun initComponent() {
-        connection.subscribe(VirtualFileManager.VFS_CHANGES, this)
-    }
-
-    override fun disposeComponent() {
-        connection.disconnect()
-    }
-
-    override fun before(events: List<VFileEvent>) {
-    }
+object I18nFileListener : BulkFileListener {
+    override fun before(events: List<VFileEvent>) {}
 
     override fun after(events: List<VFileEvent>) {
         if (events.any { it.file?.fileType == I18nFileType }) {
             EditorNotifications.updateAll()
         }
     }
-
-    override fun getComponentName() = "I18nFileListener"
 }
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/AbstractModule.kt b/src/main/kotlin/com/demonwav/mcdev/platform/AbstractModule.kt
@@ -83,5 +83,6 @@ abstract class AbstractModule(protected val facet: MinecraftFacet) {
         return parameters.isNotEmpty() && refResolve != parameters[0]
     }
 
+    open fun init() {}
     open fun dispose() {}
 }
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryModule.kt b/src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryModule.kt
@@ -19,6 +19,10 @@ import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.canary.generation.CanaryGenerationData
 import com.demonwav.mcdev.platform.canary.util.CanaryConstants
 import com.demonwav.mcdev.util.nullable
+import com.demonwav.mcdev.util.runWriteTaskLater
+import com.intellij.lang.properties.PropertiesFileType
+import com.intellij.openapi.fileTypes.FileNameMatcher
+import com.intellij.openapi.fileTypes.FileTypeManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotationMemberValue
@@ -37,6 +41,15 @@ class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, overrid
     var neptuneInf by nullable { facet.findFile(CanaryConstants.NEPTUNE_INF, SourceType.RESOURCE) }
         private set
 
+    override fun init() {
+        runWriteTaskLater {
+            FileTypeManager.getInstance().associate(PropertiesFileType.INSTANCE, object : FileNameMatcher {
+                override fun accept(fileName: String) = fileName == CanaryConstants.CANARY_INF
+                override fun getPresentableString() = CanaryConstants.CANARY_INF
+            })
+        }
+    }
+
     override fun isEventClassValid(eventClass: PsiClass, method: PsiMethod?) =
         CanaryConstants.HOOK_CLASS == eventClass.qualifiedName
 
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryProjectComponent.kt b/src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryProjectComponent.kt
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeModule.kt b/src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeModule.kt
@@ -17,9 +17,21 @@ import com.demonwav.mcdev.insight.generation.GenerationData
 import com.demonwav.mcdev.inspection.IsCancelled
 import com.demonwav.mcdev.platform.AbstractModule
 import com.demonwav.mcdev.platform.PlatformType
+import com.demonwav.mcdev.platform.forge.inspections.sideonly.SidedProxyAnnotator
 import com.demonwav.mcdev.platform.forge.util.ForgeConstants
 import com.demonwav.mcdev.util.extendsOrImplements
 import com.demonwav.mcdev.util.nullable
+import com.demonwav.mcdev.util.runWriteTaskLater
+import com.intellij.json.JsonFileType
+import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.fileTypes.FileNameMatcher
+import com.intellij.openapi.fileTypes.FileTypeManager
+import com.intellij.openapi.progress.DumbProgressIndicator
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.openapi.progress.Task
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.DumbService
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiClassType
@@ -29,6 +41,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.psi.PsiType
 import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.search.searches.AnnotatedElementsSearch
 import org.jetbrains.annotations.Contract
 
 class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(facet) {
@@ -40,6 +53,38 @@ class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(f
     override val type = PlatformType.FORGE
     override val icon = PlatformAssets.FORGE_ICON
 
+    override fun init() {
+        runWriteTaskLater {
+            FileTypeManager.getInstance().associate(JsonFileType.INSTANCE, object : FileNameMatcher {
+                override fun accept(fileName: String) = fileName == ForgeConstants.MCMOD_INFO
+                override fun getPresentableString() = ForgeConstants.MCMOD_INFO
+            })
+        }
+
+        DumbService.getInstance(project).runWhenSmart {
+            ProgressManager.getInstance().run(object : Task.Backgroundable(project, "Indexing @SidedProxy", true, null) {
+                override fun run(indicator: ProgressIndicator) {
+                    runReadAction {
+                        indicator.isIndeterminate = true
+                        val scope = GlobalSearchScope.projectScope(myProject)
+                        val sidedProxy = JavaPsiFacade.getInstance(myProject)
+                            .findClass(ForgeConstants.SIDED_PROXY_ANNOTATION, scope) ?: return@runReadAction
+                        val annotatedFields = AnnotatedElementsSearch.searchPsiFields(sidedProxy, scope).findAll()
+
+                        indicator.isIndeterminate = false
+                        var index = 0.0
+
+                        for (field in annotatedFields) {
+                            SidedProxyAnnotator.check(field)
+                            index++
+                            indicator.fraction = index / annotatedFields.size
+                        }
+                    }
+                }
+            })
+        }
+    }
+
     override fun isEventClassValid(eventClass: PsiClass, method: PsiMethod?): Boolean {
         if (method == null) {
             return ForgeConstants.FML_EVENT == eventClass.qualifiedName || ForgeConstants.EVENT == eventClass.qualifiedName
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeProjectComponent.kt b/src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeProjectComponent.kt
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/forge/inspections/sideonly/SideOnlyProjectComponent.kt b/src/main/kotlin/com/demonwav/mcdev/platform/forge/inspections/sideonly/SideOnlyProjectComponent.kt
diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/mcp/McpModule.kt b/src/main/kotlin/com/demonwav/mcdev/platform/mcp/McpModule.kt
@@ -11,28 +11,36 @@
 package com.demonwav.mcdev.platform.mcp
 
 import com.demonwav.mcdev.facet.MinecraftFacet
+import com.demonwav.mcdev.i18n.I18nFileListener
 import com.demonwav.mcdev.platform.AbstractModule
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.mcp.srg.SrgManager
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
+import com.intellij.util.messages.MessageBusConnection
 import javax.swing.Icon
 
 class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
 
+    private lateinit var connection: MessageBusConnection
+
     private val settings: McpModuleSettings = McpModuleSettings.getInstance(module)
     val accessTransformers = mutableSetOf<VirtualFile>()
 
     var srgManager: SrgManager? = null
         private set
 
-    init {
+    override fun init() {
         val files = getSettings().mappingFiles
         if (!files.isEmpty()) {
             srgManager = SrgManager.getInstance(files)
-            srgManager!!.parse()
+            srgManager?.parse()
         }
+
+        connection = project.messageBus.connect()
+        connection.subscribe(VirtualFileManager.VFS_CHANGES, I18nFileListener)
     }
 
     override val moduleType  = McpModuleType
@@ -46,7 +54,7 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
     fun updateSettings(data: McpModuleSettings.State) {
         this.settings.loadState(data)
         srgManager = SrgManager.getInstance(data.mappingFiles)
-        srgManager!!.parse()
+        srgManager?.parse()
     }
 
     fun addAccessTransformerFile(file: VirtualFile) {
@@ -56,6 +64,7 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
     override fun dispose() {
         super.dispose()
 
+        connection.disconnect()
         accessTransformers.clear()
         srgManager = null
     }
diff --git a/src/main/kotlin/com/demonwav/mcdev/transition/TransitionProjectComponent.kt b/src/main/kotlin/com/demonwav/mcdev/transition/TransitionProjectComponent.kt
@@ -18,7 +18,6 @@ import com.intellij.openapi.project.Project
 class TransitionProjectComponent(project: Project) : AbstractProjectComponent(project) {
 
     override fun projectOpened() {
-        super.projectOpened()
         // Reset all Modules back to JavaModuleType
         for (module in ModuleManager.getInstance(project).modules) {
             for (type in types) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -715,23 +715,10 @@
     </application-components>
 
     <project-components>
-        <!-- Application components for Project open listeners -->
         <component>
             <implementation-class>com.demonwav.mcdev.facet.MinecraftFacetDetector</implementation-class>
             <loadForDefaultProject/>
         </component>
-        <component>
-            <implementation-class>com.demonwav.mcdev.platform.forge.ForgeProjectComponent</implementation-class>
-            <loadForDefaultProject/>
-        </component>
-        <component>
-            <implementation-class>com.demonwav.mcdev.platform.forge.inspections.sideonly.SideOnlyProjectComponent</implementation-class>
-            <loadForDefaultProject/>
-        </component>
-        <component>
-            <implementation-class>com.demonwav.mcdev.platform.canary.CanaryProjectComponent</implementation-class>
-            <loadForDefaultProject/>
-        </component>
         <component>
             <implementation-class>com.demonwav.mcdev.transition.TransitionProjectComponent</implementation-class>
             <loadForDefaultProject/>

Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,6 @@ abstract class AbstractModule(protected val facet: MinecraftFacet) {`
`83`	`83`	`return parameters.isNotEmpty() && refResolve != parameters[0]`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ open fun init() {}`
`86`	`87`	`open fun dispose() {}`
`87`	`88`	`}`