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

Convert line separators when loading files with builtins

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-17 17:38:12 +04:00
parent e4c89f800f
commit 92ffd8ab30
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+3 -1
View File
@@ -21,6 +21,7 @@ import com.google.common.collect.*;
import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiFileFactory; import com.intellij.psi.PsiFileFactory;
import com.intellij.util.Function; import com.intellij.util.Function;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -218,8 +219,9 @@ public class KotlinBuiltIns {
} }
//noinspection IOResourceOpenedButNotSafelyClosed //noinspection IOResourceOpenedButNotSafelyClosed
String text = FileUtil.loadTextAndClose(new InputStreamReader(stream));
JetFile file = (JetFile) PsiFileFactory.getInstance(project).createFileFromText(path, JetFile file = (JetFile) PsiFileFactory.getInstance(project).createFileFromText(path,
JetFileType.INSTANCE, FileUtil.loadTextAndClose(new InputStreamReader(stream))); JetFileType.INSTANCE, StringUtil.convertLineSeparators(text));
files.add(file); files.add(file);
} }
return files; return files;