User: kyle wood
Date: 01 Mar 23 06:18
Revision: 1c22829208d67efa6e842756ffa64f7ea0e57075
Summary:
Merge branch '2022.1' into 2022.2


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ build.gradle.kts	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -9,12 +9,14 @@
  */
 
 import org.cadixdev.gradle.licenser.header.HeaderStyle
+import org.cadixdev.gradle.licenser.tasks.LicenseUpdate
 import org.gradle.internal.jvm.Jvm
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
+import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
     kotlin("jvm") version "1.8.0"
@@ -22,7 +24,7 @@
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.12.0"
+    id("org.jetbrains.intellij") version "1.13.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -272,7 +274,7 @@
                 fileTree(project.projectDir) {
                     include("*.gradle.kts", "gradle.properties")
                     exclude("**/buildSrc/**", "**/build/**")
-                }
+                },
             )
         }
         register("buildSrc") {
@@ -280,7 +282,7 @@
                 project.fileTree(project.projectDir.resolve("buildSrc")) {
                     include("**/*.kt", "**/*.kts")
                     exclude("**/build/**")
-                }
+                },
             )
         }
         register("grammars") {
@@ -289,6 +291,9 @@
     }
 }
 
+ktlint {
+    disabledRules.add("filename")
+}
 tasks.withType<BaseKtLintCheckTask>().configureEach {
     workerMaxHeapSize.set("512m")
 }
@@ -296,9 +301,7 @@
 tasks.register("format") {
     group = "minecraft"
     description = "Formats source code according to project style"
-    val licenseFormat by tasks.existing
-    val ktlintFormat by tasks.existing
-    dependsOn(licenseFormat, ktlintFormat)
+    dependsOn(tasks.withType<LicenseUpdate>(), tasks.withType<KtLintFormatTask>())
 }
 
 val generateAtLexer by lexer("AtLexer", "com/demonwav/mcdev/platform/mcp/at/gen")
@@ -328,7 +331,7 @@
         generateNbttParser,
         generateLangLexer,
         generateLangParser,
-        generateTranslationTemplateLexer
+        generateTranslationTemplateLexer,
     )
 }
 
@@ -370,7 +373,7 @@
         "--add-opens=java.desktop/javax.swing=ALL-UNNAMED",
         "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
         "--add-opens=java.desktop/sun.font=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.swing=ALL-UNNAMED"
+        "--add-opens=java.desktop/sun.swing=ALL-UNNAMED",
     )
 
     if (OperatingSystem.current().isMacOsX) {
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ gradle.properties	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -14,7 +14,7 @@
 ideaVersion = 2022.2
 ideaVersionName = 2022.2
 
-coreVersion = 1.5.22
+coreVersion = 1.6.0
 downloadIdeaSources = true
 
 pluginTomlVersion = 222.3345.108
Index: src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
===================================================================
--- src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -10,6 +10,7 @@
 
 package com.demonwav.mcdev.creator
 
+import com.demonwav.mcdev.creator.ProjectSetupFinalizer.Factory
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.demonwav.mcdev.util.toTypedArray
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
@@ -97,7 +98,7 @@
 }
 
 class JdkProjectSetupFinalizer(
-    parent: NewProjectWizardStep
+    parent: NewProjectWizardStep,
 ) : AbstractNewProjectWizardStep(parent), ProjectSetupFinalizer {
     private val sdkProperty: GraphProperty<Sdk?> = propertyGraph.property(null)
     private var sdk by sdkProperty
Index: src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -23,7 +23,7 @@
 import com.intellij.ui.dsl.builder.Panel
 
 abstract class AbstractBuildSystemStep(
-    parent: NewProjectWizardStep
+    parent: NewProjectWizardStep,
 ) : AbstractNewProjectWizardMultiStep<AbstractBuildSystemStep, AbstractBuildSystemStep.Factory>(parent, EP_NAME) {
     companion object {
         private val PLATFORM_NAME_KEY = Key.create<String>("mcdev.platformName")
@@ -93,7 +93,7 @@
 
 abstract class AbstractRunBuildSystemStep(
     parent: NewProjectWizardStep,
-    private val buildSystemStepClass: Class<out AbstractBuildSystemStep>
+    private val buildSystemStepClass: Class<out AbstractBuildSystemStep>,
 ) : AbstractNewProjectWizardStep(parent) {
     abstract val step: String
 
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -87,7 +87,7 @@
     protected fun setupDependencies(
         model: MavenDomProjectModel,
         repositories: List<BuildRepository>,
-        dependencies: List<BuildDependency>
+        dependencies: List<BuildDependency>,
     ) {
         for ((id, url, types) in repositories) {
             if (!types.contains(BuildSystemType.MAVEN)) {
Index: src/main/kotlin/creator/creator-utils.kt
===================================================================
--- src/main/kotlin/creator/creator-utils.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/creator/creator-utils.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -137,12 +137,13 @@
 
 class EmptyStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent)
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
     f3: (T3) -> T4,
     f4: (T4) -> T5,
-    f5: (T5) -> T6
+    f5: (T5) -> T6,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -150,7 +151,6 @@
           T4 : NewProjectWizardStep,
           T5 : NewProjectWizardStep,
           T6 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -159,13 +159,14 @@
     return stepSequence(this, s1, s2, s3, s4, s5)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
     f3: (T3) -> T4,
     f4: (T4) -> T5,
     f5: (T5) -> T6,
-    f6: (T6) -> T7
+    f6: (T6) -> T7,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -174,7 +175,6 @@
           T5 : NewProjectWizardStep,
           T6 : NewProjectWizardStep,
           T7 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -184,6 +184,7 @@
     return stepSequence(this, s1, s2, s3, s4, s5, s6)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7, T8> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
@@ -191,7 +192,7 @@
     f4: (T4) -> T5,
     f5: (T5) -> T6,
     f6: (T6) -> T7,
-    f7: (T7) -> T8
+    f7: (T7) -> T8,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -201,7 +202,6 @@
           T6 : NewProjectWizardStep,
           T7 : NewProjectWizardStep,
           T8 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -212,6 +212,7 @@
     return stepSequence(this, s1, s2, s3, s4, s5, s6, s7)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7, T8, T9> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
@@ -220,7 +221,7 @@
     f5: (T5) -> T6,
     f6: (T6) -> T7,
     f7: (T7) -> T8,
-    f8: (T8) -> T9
+    f8: (T8) -> T9,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -231,7 +232,6 @@
           T7 : NewProjectWizardStep,
           T8 : NewProjectWizardStep,
           T9 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -243,6 +243,7 @@
     return stepSequence(this, s1, s2, s3, s4, s5, s6, s7, s8)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
@@ -252,7 +253,7 @@
     f6: (T6) -> T7,
     f7: (T7) -> T8,
     f8: (T8) -> T9,
-    f9: (T9) -> T10
+    f9: (T9) -> T10,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -264,7 +265,6 @@
           T8 : NewProjectWizardStep,
           T9 : NewProjectWizardStep,
           T10 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -277,6 +277,7 @@
     return stepSequence(this, s1, s2, s3, s4, s5, s6, s7, s8, s9)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
@@ -287,7 +288,7 @@
     f7: (T7) -> T8,
     f8: (T8) -> T9,
     f9: (T9) -> T10,
-    f10: (T10) -> T11
+    f10: (T10) -> T11,
 ): NewProjectWizardStep
     where T1 : NewProjectWizardStep,
           T2 : NewProjectWizardStep,
@@ -300,7 +301,6 @@
           T9 : NewProjectWizardStep,
           T10 : NewProjectWizardStep,
           T11 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
@@ -314,6 +314,7 @@
     return stepSequence(this, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10)
 }
 
+@Suppress("DuplicatedCode")
 fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> T1.chain(
     f1: (T1) -> T2,
     f2: (T2) -> T3,
@@ -325,7 +326,7 @@
     f8: (T8) -> T9,
     f9: (T9) -> T10,
     f10: (T10) -> T11,
-    f11: (T11) -> T12
+    f11: (T11) -> T12,
 ): NewProjectWizardStep
         where T1 : NewProjectWizardStep,
               T2 : NewProjectWizardStep,
@@ -339,7 +340,6 @@
               T10 : NewProjectWizardStep,
               T11 : NewProjectWizardStep,
               T12 : NewProjectWizardStep {
-
     val s1 = f1(this)
     val s2 = f2(s1)
     val s3 = f3(s2)
Index: src/main/kotlin/creator/step/AbstractLatentStep.kt
===================================================================
--- src/main/kotlin/creator/step/AbstractLatentStep.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/creator/step/AbstractLatentStep.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -139,7 +139,7 @@
                             lifetime?.let(Disposer::dispose)
                             lifetime = null
                         }
-                    }
+                    },
                 )
                     .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
                     .validation(DialogValidation { ValidationInfo("Haven't finished $description") })
Index: src/main/kotlin/platform/mixin/action/FindMixinsAction.kt
===================================================================
--- src/main/kotlin/platform/mixin/action/FindMixinsAction.kt	(revision 4f804b45edc56dcfc9b55d7724bb1d7cef0c20ff)
+++ src/main/kotlin/platform/mixin/action/FindMixinsAction.kt	(revision 1c22829208d67efa6e842756ffa64f7ea0e57075)
@@ -54,7 +54,7 @@
         fun findMixins(
             clazz: PsiClass,
             project: Project,
-            indicator: ProgressIndicator? = null
+            indicator: ProgressIndicator? = null,
         ): List<PsiClass>? {
             return clazz.cached(PsiModificationTracker.MODIFICATION_COUNT) {
                 val targetInternalName = clazz.fullQualifiedName?.replace('.', '/')
@@ -62,13 +62,13 @@
 
                 val mixinAnnotation = JavaPsiFacade.getInstance(project).findClass(
                     MixinConstants.Annotations.MIXIN,
-                    GlobalSearchScope.allScope(project)
+                    GlobalSearchScope.allScope(project),
                 ) ?: return@cached null
 
                 // Check all classes with the Mixin annotation
                 val classes = AnnotatedElementsSearch.searchPsiClasses(
                     mixinAnnotation,
-                    GlobalSearchScope.projectScope(project)
+                    GlobalSearchScope.projectScope(project),
                 )
                     .filter {
                         indicator?.text = "Checking ${it.name}..."