From 64dac7a19d821771a42392245eee57662421dd3e Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 10 Dec 2014 12:06:44 +0300 Subject: [PATCH] Fix line separators in JsLibrarySourceConfig --- .../jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java index e432627b325..b286e962a4d 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfigWithCaching.java @@ -18,6 +18,7 @@ package org.jetbrains.k2js.config; import com.google.common.base.Predicates; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; @@ -103,7 +104,7 @@ public class LibrarySourcesConfigWithCaching extends LibrarySourcesConfig { protected JetFile getJetFileByVirtualFile(VirtualFile file, String moduleName, PsiManager psiManager) { JetFile jetFile; 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); } catch (IOException e) {