diff --git a/translator/src/org/jetbrains/k2js/config/Config.java b/translator/src/org/jetbrains/k2js/config/Config.java index ae39f2dd735..4f05c837795 100644 --- a/translator/src/org/jetbrains/k2js/config/Config.java +++ b/translator/src/org/jetbrains/k2js/config/Config.java @@ -45,7 +45,7 @@ public abstract class Config { List lines = Files.readLines(file, Charsets.UTF_8); return lines.get(0); } catch (Exception ex) { - return "jslib\\src"; + return "/src"; } } diff --git a/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java b/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java index ff9bceaf284..b10eb1cb28e 100644 --- a/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java +++ b/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java @@ -1,5 +1,6 @@ package org.jetbrains.k2js.utils; +import com.google.common.io.ByteStreams; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -12,8 +13,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetLanguage; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; @@ -29,7 +32,20 @@ public final class JetFileUtils { @NotNull private static String doLoadFile(@NotNull String path) throws IOException { - String text = FileUtil.loadFile(new File(path), CharsetToolkit.UTF8).trim(); + path = path.replace("\\", "/"); + InputStreamReader reader = new InputStreamReader(JetFileUtils.class.getResourceAsStream(path)); + StringBuilder response = new StringBuilder(); + BufferedReader bufferedReader = new BufferedReader(reader); + + String tmp; + while ((tmp = bufferedReader.readLine()) != null) { + response.append(tmp); + response.append(System.getProperty("line.separator")); + } + + reader.close(); + String text = response.toString(); +// String text = FileUtil.loadFile(new File(path), CharsetToolkit.UTF8).trim(); text = StringUtil.convertLineSeparators(text); return text; }