open as maven project, workaround for closing ide in background

Author: MarcinVaadin

src/main/kotlin/com/vaadin/plugin/module/VaadinModuleBuilder.kt

@@ -1,5 +1,6 @@
 package com.vaadin.plugin.module
 
+import com.intellij.ide.impl.ProjectUtil
 import com.intellij.ide.util.projectWizard.ModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
@@ -8,10 +9,10 @@ import com.intellij.openapi.module.ModifiableModuleModel
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleType
 import com.intellij.openapi.project.ProjectType
-import com.intellij.openapi.roots.ui.configuration.ModulesProvider
+import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.openapi.startup.StartupManager
 import com.vaadin.plugin.starter.StarterModel
-import com.vaadin.plugin.utils.ProjectUtil
-
+import com.vaadin.plugin.utils.VaadinProjectUtil
 
 class VaadinModuleBuilder : ModuleBuilder() {
 
@@ -25,13 +26,6 @@ class VaadinModuleBuilder : ModuleBuilder() {
         return VaadinModuleType("VaadinModule")
     }
 
-    override fun createWizardSteps(
-        wizardContext: WizardContext,
-        modulesProvider: ModulesProvider
-    ): Array<ModuleWizardStep> {
-        return emptyArray()
-    }
-
     override fun getCustomOptionsStep(context: WizardContext?, parentDisposable: Disposable?): ModuleWizardStep {
         return VaadinCustomOptionsStep(this)
     }
@@ -40,13 +34,21 @@ class VaadinModuleBuilder : ModuleBuilder() {
         this.model = model
     }
 
+    override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
+        val project = modifiableRootModel.project
+        // TODO: Load Maven/Gradle project properly without opening new window
+        StartupManager.getInstance(project).runAfterOpened {
+            ProjectUtil.openOrImport(project.basePath!!, project, true)
+        }
+    }
+
     override fun createModule(moduleModel: ModifiableModuleModel): Module {
-        ProjectUtil.downloadAndExtract(moduleModel.project, this.model!!.downloadLink())
+        VaadinProjectUtil.downloadAndExtract(moduleModel.project, this.model!!.downloadLink())
         return super.createModule(moduleModel)
     }
 
     override fun getProjectType(): ProjectType? {
-        return ProjectType.create(model?.language)
+        return ProjectType.create(this.model!!.buildTool)
     }
 
 }

src/main/kotlin/com/vaadin/plugin/module/VaadinPostStartupProjectClose.kt

@@ -0,0 +1,30 @@
+package com.vaadin.plugin.module
+
+import com.intellij.ide.impl.ProjectUtil
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.progress.runBlockingModal
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ex.ProjectManagerEx
+import com.intellij.openapi.startup.ProjectActivity
+
+// TODO: Remove this after fixing Maven/Gradle module loading
+class VaadinPostStartupProjectClose : ProjectActivity {
+
+    override suspend fun execute(project: Project) {
+        ProjectUtil.getOpenProjects().filter { it != project && it.name == project.name }.forEach {
+            it.closeProjectAsync(false)
+        }
+    }
+
+    // copy com.intellij.testFramework.closeProjectAsync
+    private suspend fun Project.closeProjectAsync(save: Boolean = false) {
+        if (ApplicationManager.getApplication().isDispatchThread) {
+            runBlockingModal(this, "") {
+                ProjectManagerEx.getInstanceEx().forceCloseProjectAsync(this@closeProjectAsync, save = save)
+            }
+        } else {
+            ProjectManagerEx.getInstanceEx().forceCloseProjectAsync(this, save = save)
+        }
+    }
+
+}

src/main/kotlin/com/vaadin/plugin/utils/ProjectUtil.kt renamed to src/main/kotlin/com/vaadin/plugin/utils/VaadinProjectUtil.kt

@@ -10,11 +10,11 @@ import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.name
 
-class ProjectUtil {
+class VaadinProjectUtil {
 
     companion object {
 
-        private val LOG: Logger = Logger.getInstance(ProjectUtil::class.java)
+        private val LOG: Logger = Logger.getInstance(VaadinProjectUtil::class.java)
 
         fun downloadAndExtract(project: Project, url: String) {
             val filename = Path.of(url).name

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

@@ -39,6 +39,7 @@
         <projectService serviceImplementation="com.vaadin.plugin.copilot.service.CopilotServerServiceImpl"
                         serviceInterface="com.vaadin.plugin.copilot.service.CopilotServerService"/>
         <postStartupActivity implementation="com.vaadin.plugin.copilot.activity.CopilotPostStartupProjectActivity"/>
+        <postStartupActivity implementation="com.vaadin.plugin.module.VaadinPostStartupProjectClose" />
         <errorHandler implementation="com.vaadin.plugin.copilot.CopilotErrorHandler"/>
         <statusBarWidgetFactory implementation="com.vaadin.plugin.copilot.CopilotStatusBarWidgetFactory"
                                 id="CopilotStatusBarWidgetFactory" order="last"/>