From 7ec49eafb94a957f0508c0bb738e9b3d97ad9fda Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Jul 2012 16:41:27 +0400 Subject: [PATCH] Using standard utilities for files loading --- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 26ad771177f..c6bfb213ff9 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -23,7 +23,6 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ShutDownTracker; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; @@ -280,8 +279,7 @@ public class JetTestUtils { } public static String doLoadFile(@NotNull File file) throws IOException { - String text = FileUtil.loadFile(file, CharsetToolkit.UTF8).trim(); - return StringUtil.convertLineSeparators(text); + return FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim(); } public static String getFilePath(File file) {