azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using standard utilities for files loading

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-11 16:41:27 +04:00
parent dbca884b85
commit 7ec49eafb9
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+1 -3
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.ShutDownTracker; import com.intellij.openapi.util.ShutDownTracker;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory; import com.intellij.psi.PsiFileFactory;
@@ -280,8 +279,7 @@ public class JetTestUtils {
} }
public static String doLoadFile(@NotNull File file) throws IOException { public static String doLoadFile(@NotNull File file) throws IOException {
String text = FileUtil.loadFile(file, CharsetToolkit.UTF8).trim(); return FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim();
return StringUtil.convertLineSeparators(text);
} }
public static String getFilePath(File file) { public static String getFilePath(File file) {