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

Fix line separators in JsLibrarySourceConfig

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-12-10 12:06:44 +03:00
parent c807cebfe6
commit 64dac7a19d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.k2js.config;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
@@ -103,7 +104,7 @@ public class LibrarySourcesConfigWithCaching extends LibrarySourcesConfig {
protected JetFile getJetFileByVirtualFile(VirtualFile file, String moduleName, PsiManager psiManager) { protected JetFile getJetFileByVirtualFile(VirtualFile file, String moduleName, PsiManager psiManager) {
JetFile jetFile; JetFile jetFile;
try { try {
String text = new String(file.contentsToByteArray(false), file.getCharset()); String text = StringUtil.convertLineSeparators(new String(file.contentsToByteArray(false), file.getCharset()));
jetFile = new JetPsiFactory(getProject()).createPhysicalFile(file.getName(), text); jetFile = new JetPsiFactory(getProject()).createPhysicalFile(file.getName(), text);
} }
catch (IOException e) { catch (IOException e) {