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

JS: Force Rhino to load files using UTF8 encoding. Fixes failing kt14597 on windows agents.

Browse Source
This commit is contained in:
Anton Bannykh
2017-02-21 13:09:22 +03:00
parent 66f5a12cc4
commit 909d83c3af
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.js.test.rhino;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -106,7 +107,7 @@ public final class RhinoUtils {
@NotNull Scriptable scope) throws Exception { @NotNull Scriptable scope) throws Exception {
String result; String result;
try { try {
result = FileUtil.loadFile(new File(inputFile), true); result = FileUtil.loadFile(new File(inputFile), CharsetToolkit.UTF8, true);
} }
catch (IOException e) { catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);