From 067fdffe50e6f8469d3efc427cab06d59af507c5 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Wed, 16 Jan 2019 17:34:28 +0300 Subject: [PATCH] proper encoding for mdn docs loading (WEB-36779) --- .../intellij/xml/util/documentation/MdnDocumentationUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/xml/util/documentation/MdnDocumentationUtil.java b/xml/impl/src/com/intellij/xml/util/documentation/MdnDocumentationUtil.java index da422b2c6697..2940179860e4 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/MdnDocumentationUtil.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/MdnDocumentationUtil.java @@ -8,6 +8,7 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.platform.templates.github.DownloadUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -123,7 +124,7 @@ public class MdnDocumentationUtil { if (!targetFile.exists()) { DownloadUtil.downloadAtomically(ProgressManager.getInstance().getProgressIndicator(), url + "?raw&summary", targetFile); } - String content = FileUtil.loadFile(targetFile); + String content = FileUtil.loadFile(targetFile, CharsetToolkit.UTF8_CHARSET); String mdnDecorated = decorate(fixLinks(content), url); if (text == null) { return mdnDecorated;