User: rednesto
Date: 15 Jul 24 14:49
Revision: c58995f6b632d2df66c6a2b741e6a46d7fdaa3c2
Summary:
Reformat created files without keeping line breaks

Fixes #2330


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

Index: src/main/kotlin/creator/custom/CustomPlatformStep.kt
===================================================================
--- src/main/kotlin/creator/custom/CustomPlatformStep.kt	(revision 96a55b2d70305bd6813279cb806f4c008cbad2f7)
+++ src/main/kotlin/creator/custom/CustomPlatformStep.kt	(revision c58995f6b632d2df66c6a2b741e6a46d7fdaa3c2)
@@ -32,6 +32,7 @@
 import com.demonwav.mcdev.creator.modalityState
 import com.demonwav.mcdev.util.toTypedArray
 import com.demonwav.mcdev.util.virtualFileOrError
+import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.codeInsight.actions.ReformatCodeProcessor
 import com.intellij.ide.projectView.ProjectView
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
@@ -553,8 +554,19 @@
         val psiFiles = files.asSequence()
             .filter { (desc, _) -> desc.reformat != false }
             .mapNotNull { (_, file) -> psiManager.findFile(file) }
-        ReformatCodeProcessor(project, psiFiles.toTypedArray(), null, false).run()
+
+        val processor = ReformatCodeProcessor(project, psiFiles.toTypedArray(), null, false)
+        psiFiles.forEach(processor::setDoNotKeepLineBreaks)
+
+        val insightSettings = CodeInsightSettings.getInstance()
+        val oldSecondReformat = insightSettings.ENABLE_SECOND_REFORMAT
+        insightSettings.ENABLE_SECOND_REFORMAT = true
+        try {
+            processor.run()
+        } finally {
+            insightSettings.ENABLE_SECOND_REFORMAT = oldSecondReformat
-    }
+        }
+    }
 
     private fun openFilesInEditor(
         project: Project,