User: rednesto
Date: 12 Sep 24 23:28
Revision: 07d1a7ce5b993571687cb3ba839bc22a37082296
Summary:
Merge branch '2024.1' into 2024.2


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

Index: src/main/kotlin/creator/custom/CreatorTemplateProcessor.kt
===================================================================
--- src/main/kotlin/creator/custom/CreatorTemplateProcessor.kt	(revision d0d3a4bff8c3a7219d0a0b15bf44699e40c38c77)
+++ src/main/kotlin/creator/custom/CreatorTemplateProcessor.kt	(revision 07d1a7ce5b993571687cb3ba839bc22a37082296)
@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.creator.custom
 
 import com.demonwav.mcdev.asset.MCDevBundle
-import com.demonwav.mcdev.asset.MCDevBundle.invoke
 import com.demonwav.mcdev.creator.custom.finalizers.CreatorFinalizer
 import com.demonwav.mcdev.creator.custom.providers.EmptyLoadedTemplate
 import com.demonwav.mcdev.creator.custom.providers.LoadedTemplate
@@ -55,12 +54,10 @@
 import com.intellij.util.application
 import java.nio.file.Path
 import java.util.function.Consumer
-import kotlin.collections.mapNotNull
-import kotlin.collections.orEmpty
-import kotlin.collections.set
 import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 interface ExternalTemplatePropertyProvider {
 
@@ -286,7 +283,7 @@
             }
         }
 
-        val finalizeAction = {
+        val finalizeAction = suspend {
             WriteAction.runAndWait<Throwable> {
                 LocalFileSystem.getInstance().refresh(false)
                 // Apparently a module root is required for the reformat to work
@@ -304,7 +301,7 @@
         if (context.wizardContext.isCreatingNewProject) {
             TemplateService.instance.registerFinalizerAction(project, finalizeAction)
         } else {
-            application.executeOnPooledThread { finalizeAction() }
+            context.scope.launch { finalizeAction() }
         }
     }