Wizard: fix wrong line separators

#KT-36328 fixed
This commit is contained in:
Ilya Kirillov
2020-02-10 22:50:51 +03:00
parent fa4d790f5a
commit 54c9582ac4
2 changed files with 4 additions and 2 deletions
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard.service
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.codeStyle.CodeStyleManager
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -14,7 +15,7 @@ import java.io.File
class IdeaFileFormattingService(private val project: Project) : FileFormattingService, IdeaWizardService {
override fun formatFile(text: String, filename: String): String = runReadAction {
val psiFile = createPsiFile(text, filename) ?: return@runReadAction text
val psiFile = createPsiFile(StringUtil.convertLineSeparators(text), filename) ?: return@runReadAction text
CodeStyleManager.getInstance(project).reformat(psiFile).text
}
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard.service
import com.intellij.openapi.util.text.StringUtil
import com.intellij.openapi.vfs.VfsUtil
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult
@@ -25,7 +26,7 @@ class IdeaFileSystemWizardService : FileSystemWizardService, IdeaWizardService {
val directory =
VfsUtil.createDirectoryIfMissing(directoryPath.toFile().toString())!!
val virtualFile = directory.createChildData(this, path.fileName.toString())
VfsUtil.saveText(virtualFile, text)
VfsUtil.saveText(virtualFile, StringUtil.convertLineSeparators(text))
}
}
}