User: rednesto
Date: 19 Mar 23 19:35
Revision: 67fd41d986783be2aa76f13b5c85924b26e30bf3
Summary:
Merge branch '2022.1' into 2022.2

# Conflicts:
#	src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
#	src/main/kotlin/creator/buildsystem/maven-steps.kt


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision c504db6b54d4e89644f16b0bb22326ff1d2d3c1c)
+++ build.gradle.kts	(revision 67fd41d986783be2aa76f13b5c85924b26e30bf3)
@@ -24,7 +24,7 @@
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.13.0"
+    id("org.jetbrains.intellij") version "1.13.2"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision c504db6b54d4e89644f16b0bb22326ff1d2d3c1c)
+++ gradle.properties	(revision 67fd41d986783be2aa76f13b5c85924b26e30bf3)
@@ -14,7 +14,7 @@
 ideaVersion = 2022.2
 ideaVersionName = 2022.2
 
-coreVersion = 1.6.1
+coreVersion = 1.6.2
 downloadIdeaSources = true
 
 pluginTomlVersion = 222.3345.108
Index: src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
===================================================================
--- src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision c504db6b54d4e89644f16b0bb22326ff1d2d3c1c)
+++ src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision 67fd41d986783be2aa76f13b5c85924b26e30bf3)
@@ -11,11 +11,10 @@
 package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.creator.ProjectSetupFinalizer.Factory
+import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.util.mapFirstNotNull
-import com.demonwav.mcdev.util.toTypedArray
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardStep
-import com.intellij.ide.wizard.stepSequence
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.observable.properties.GraphProperty
 import com.intellij.openapi.project.Project
@@ -46,12 +45,18 @@
         result
     }
     private val step by lazy {
-        if (finalizers.isEmpty()) {
-            null
-        } else {
-            stepSequence(finalizers[0], *finalizers.asSequence().drop(1).toTypedArray())
+        when (finalizers.size) {
+            0 -> null
+            1 -> finalizers[0]
+            else -> {
+                var step = finalizers[0].nextStep { finalizers[1] }
+                for (i in 2 until finalizers.size) {
+                    step = step.nextStep { finalizers[i] }
-        }
+                }
+                step
-    }
+            }
+        }
+    }
 
     override fun setupUI(builder: Panel) {
         step?.setupUI(builder)
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision c504db6b54d4e89644f16b0bb22326ff1d2d3c1c)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 67fd41d986783be2aa76f13b5c85924b26e30bf3)
@@ -21,6 +21,7 @@
 import com.demonwav.mcdev.util.invokeAndWait
 import com.demonwav.mcdev.util.runWriteAction
 import com.demonwav.mcdev.util.runWriteTask
+import com.intellij.execution.RunManager
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider
@@ -35,6 +36,8 @@
 import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
+import org.jetbrains.idea.maven.execution.MavenRunConfiguration
+import org.jetbrains.idea.maven.execution.MavenRunConfigurationType
 import org.jetbrains.idea.maven.project.importing.MavenImportingManager
 
 private val pluginVersions by lazy {
@@ -165,5 +168,39 @@
         } ?: return
 
         promise.finishPromise.blockingGet(Int.MAX_VALUE, TimeUnit.SECONDS)
+
+        val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
+        addRunTaskConfiguration(project, buildSystemProps, "package")
     }
+
+    private fun addRunTaskConfiguration(
+        project: Project,
+        buildSystemProps: BuildSystemPropertiesStep<*>,
+        task: String,
+    ) {
+        val mavenConfigFactory = MavenRunConfigurationType.getInstance().configurationFactories.first()
+
+        val runManager = RunManager.getInstance(project)
+        val runConfigName = buildSystemProps.artifactId + ' ' + task
+
+        val templateConfig = mavenConfigFactory.createTemplateConfiguration(project)
+        val runConfiguration = mavenConfigFactory.createConfiguration(runConfigName, templateConfig)
+            as MavenRunConfiguration
+        runConfiguration.runnerParameters.goals.add(task)
+
+        runConfiguration.isAllowRunningInParallel = false
+
+        val settings = runManager.createConfiguration(
+            runConfiguration,
+            mavenConfigFactory,
+        )
+
+        settings.isActivateToolWindowBeforeRun = true
+        settings.storeInLocalWorkspace()
+
+        runManager.addConfiguration(settings)
+        if (runManager.selectedConfiguration == null) {
+            runManager.selectedConfiguration = settings
-}
+        }
+    }
+}
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision c504db6b54d4e89644f16b0bb22326ff1d2d3c1c)
+++ src/main/resources/META-INF/plugin.xml	(revision 67fd41d986783be2aa76f13b5c85924b26e30bf3)
@@ -632,6 +632,14 @@
         <!--endregion-->
 
         <!--region MIXIN INSPECTIONS-->
+        <localInspection displayName="Mixin is not written in Java"
+                         shortName="NonJavaMixin"
+                         groupName="Mixin"
+                         language="UAST"
+                         enabledByDefault="true"
+                         level="WARNING"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.platform.mixin.inspection.NonJavaMixinInspection"/>
         <localInspection displayName="Mixin not in a mixin config"
                           shortName="UnusedMixin"
                           groupName="Mixin"