Skip to content

Commit 909d83c

Browse files
committed
JS: Force Rhino to load files using UTF8 encoding. Fixes failing kt14597 on windows agents.
1 parent 66f5a12 commit 909d83c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.common.collect.Sets;
2020
import com.intellij.openapi.util.io.FileUtil;
21+
import com.intellij.openapi.vfs.CharsetToolkit;
2122
import com.intellij.util.containers.ContainerUtil;
2223
import org.jetbrains.annotations.NotNull;
2324
import org.jetbrains.annotations.Nullable;
@@ -106,7 +107,7 @@ private static void runFileWithRhino(@NotNull String inputFile,
106107
@NotNull Scriptable scope) throws Exception {
107108
String result;
108109
try {
109-
result = FileUtil.loadFile(new File(inputFile), true);
110+
result = FileUtil.loadFile(new File(inputFile), CharsetToolkit.UTF8, true);
110111
}
111112
catch (IOException e) {
112113
throw new RuntimeException(e);

0 commit comments

Comments
 (0)