Merge branch '2022.1' into 2022.2

Author: DenWav

build.gradle.kts

@@ -9,20 +9,22 @@
  */
 
 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"
     java
     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,15 +274,15 @@ license {
                 fileTree(project.projectDir) {
                     include("*.gradle.kts", "gradle.properties")
                     exclude("**/buildSrc/**", "**/build/**")
-                }
+                },
             )
         }
         register("buildSrc") {
             files.from(
                 project.fileTree(project.projectDir.resolve("buildSrc")) {
                     include("**/*.kt", "**/*.kts")
                     exclude("**/build/**")
-                }
+                },
             )
         }
         register("grammars") {
@@ -289,16 +291,17 @@ license {
     }
 }
 
+ktlint {
+    disabledRules.add("filename")
+}
 tasks.withType<BaseKtLintCheckTask>().configureEach {
     workerMaxHeapSize.set("512m")
 }
 
 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 @@ val generate by tasks.registering {
         generateNbttParser,
         generateLangLexer,
         generateLangParser,
-        generateTranslationTemplateLexer
+        generateTranslationTemplateLexer,
     )
 }
 
@@ -370,7 +373,7 @@ tasks.buildSearchableOptions {
         "--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) {

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2022.2
 ideaVersionName = 2022.2
 
-coreVersion = 1.5.22
+coreVersion = 1.6.0
 downloadIdeaSources = true
 
 pluginTomlVersion = 222.3345.108

src/main/kotlin/MinecraftSettings.kt

@@ -24,7 +24,7 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         var isShowEventListenerGutterIcons: Boolean = true,
         var isShowChatColorGutterIcons: Boolean = true,
         var isShowChatColorUnderlines: Boolean = false,
-        var underlineType: UnderlineType = UnderlineType.DOTTED
+        var underlineType: UnderlineType = UnderlineType.DOTTED,
     )
 
     private var state = State()
@@ -81,7 +81,8 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         DOTTED("Dotted", EffectType.BOLD_DOTTED_LINE),
         BOXED("Boxed", EffectType.BOXED),
         ROUNDED_BOXED("Rounded Boxed", EffectType.ROUNDED_BOX),
-        WAVED("Waved", EffectType.WAVE_UNDERSCORE);
+        WAVED("Waved", EffectType.WAVE_UNDERSCORE),
+        ;
 
         override fun toString(): String {
             return regular

src/main/kotlin/creator/JdkComboBoxWithPreference.kt

@@ -107,7 +107,7 @@ class JdkComboBoxWithPreference internal constructor(
 fun Row.jdkComboBoxWithPreference(
     context: WizardContext,
     sdkProperty: ObservableMutableProperty<Sdk?>,
-    sdkPropertyId: String
+    sdkPropertyId: String,
 ): Cell<JdkComboBoxWithPreference> {
     val sdkModel = ProjectSdksModel()
 
@@ -152,7 +152,7 @@ fun Row.jdkComboBoxWithPreference(
                     preferenceData.sdkPathByJdk[jdk] = homePath
                     stateComponent.setList(
                         preferenceDataProperty,
-                        preferenceData.sdkPathByJdk.map { (jdk, sdk) -> "${jdk.ordinal}=$sdk" }
+                        preferenceData.sdkPathByJdk.map { (jdk, sdk) -> "${jdk.ordinal}=$sdk" },
                     )
                 }
             }

src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt

@@ -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 @@ interface ProjectSetupFinalizer : NewProjectWizardStep {
 }
 
 class JdkProjectSetupFinalizer(
-    parent: NewProjectWizardStep
+    parent: NewProjectWizardStep,
 ) : AbstractNewProjectWizardStep(parent), ProjectSetupFinalizer {
     private val sdkProperty: GraphProperty<Sdk?> = propertyGraph.property(null)
     private var sdk by sdkProperty

src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt

@@ -23,7 +23,7 @@ import com.intellij.openapi.util.Key
 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 @@ class MavenBuildSystem : AbstractBuildSystemStep.Factory {
 
 abstract class AbstractRunBuildSystemStep(
     parent: NewProjectWizardStep,
-    private val buildSystemStepClass: Class<out AbstractBuildSystemStep>
+    private val buildSystemStepClass: Class<out AbstractBuildSystemStep>,
 ) : AbstractNewProjectWizardStep(parent) {
     abstract val step: String
 

src/main/kotlin/creator/buildsystem/BuildSystem.kt

@@ -22,11 +22,11 @@ data class BuildDependency(
     val artifactId: String = "",
     val version: String = "",
     val mavenScope: String? = null,
-    val gradleConfiguration: String? = null
+    val gradleConfiguration: String? = null,
 )
 
 data class BuildRepository(
     var id: String = "",
     var url: String = "",
-    val buildSystems: EnumSet<BuildSystemType> = EnumSet.allOf(BuildSystemType::class.java)
+    val buildSystems: EnumSet<BuildSystemType> = EnumSet.allOf(BuildSystemType::class.java),
 )

src/main/kotlin/creator/buildsystem/BuildSystemSupport.kt

@@ -21,7 +21,7 @@ import com.intellij.util.xmlb.annotations.Attribute
 interface BuildSystemSupport {
     companion object {
         private val EP_NAME = ExtensionPointName<KeyedLazyInstance<BuildSystemSupport>>(
-            "com.demonwav.minecraft-dev.buildSystemSupport"
+            "com.demonwav.minecraft-dev.buildSystemSupport",
         )
         private val COLLECTOR = KeyedExtensionCollector<BuildSystemSupport, Pair<String, String>>(EP_NAME)
 

src/main/kotlin/creator/buildsystem/gradle-steps.kt

@@ -160,7 +160,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
                             "$gradleConfig \"${escapeGString(dep.groupId)}:${
                             escapeGString(dep.artifactId)
                             }:${escapeGString(dep.version)}\"",
-                            depsBlock
+                            depsBlock,
                         )
                         depsBlock.addStatementBefore(stmt, null)
                     }
@@ -175,7 +175,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
                         val stmt = elementFactory.createExpression(
                             "$gradleConfig(\"${escapeGString(dep.groupId)}:${
                             escapeGString(dep.artifactId)
-                            }:${escapeGString(dep.version)}\")"
+                            }:${escapeGString(dep.version)}\")",
                         )
                         depsBlock.addBefore(stmt, depsBlock.rBrace)
                     }
@@ -249,7 +249,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
         project: Project,
         element: GrStatementOwner,
         name: String,
-        first: Boolean = false
+        first: Boolean = false,
     ): GrClosableBlock {
         findGroovyBlock(element, name)?.let { return it }
         val block = GroovyPsiElementFactory.getInstance(project).createStatementFromText("$name {\n}", element)
@@ -277,7 +277,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
         project: Project,
         element: KtBlockExpression,
         name: String,
-        first: Boolean = false
+        first: Boolean = false,
     ): KtBlockExpression {
         findKotlinBlock(element, name)?.let { return it }
         val block = KtPsiFactory(project).createExpression("$name {\n}")
@@ -313,7 +313,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
 
     class GradleFiles(
         private val project: Project,
-        private val rootDir: VirtualFile
+        private val rootDir: VirtualFile,
     ) {
         private val lazyBuildGradle = lazy {
             val file = rootDir.findChild("build.gradle") ?: rootDir.findChild("build.gradle.kts")
@@ -413,7 +413,7 @@ open class GradleImportStep(parent: NewProjectWizardStep) : AbstractLongRunningS
         project: Project,
         rootDirectory: Path,
         buildSystemProps: BuildSystemPropertiesStep<*>,
-        task: String
+        task: String,
     ) {
         val gradleType = GradleExternalTaskConfigurationType.getInstance()
 
@@ -431,7 +431,7 @@ open class GradleImportStep(parent: NewProjectWizardStep) : AbstractLongRunningS
 
         val settings = runManager.createConfiguration(
             runConfiguration,
-            gradleType.factory
+            gradleType.factory,
         )
 
         settings.isActivateToolWindowBeforeRun = true

src/main/kotlin/creator/buildsystem/maven-steps.kt

@@ -87,7 +87,7 @@ abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLong
     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)) {