Wizard: fix wrong line separators
#KT-36328 fixed
This commit is contained in:
+2
-1
@@ -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
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -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))
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user