From 2fe100243a439fb1bf02f90b9ca685bd2d268934 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Fri, 17 Apr 2015 20:10:45 +0300
Subject: [PATCH] IDEA-77392 diff: use native-to-ascii charset for properties
 files

---
 platform/diff-impl/diff-impl.iml                           | 1 +
 .../intellij/diff/contents/FileAwareDocumentContent.java   | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/platform/diff-impl/diff-impl.iml b/platform/diff-impl/diff-impl.iml
index 33ecce71f528..d0d53d801304 100644
--- a/platform/diff-impl/diff-impl.iml
+++ b/platform/diff-impl/diff-impl.iml
@@ -14,5 +14,6 @@
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="vcs-api-core" />
+    <orderEntry type="module" module-name="boot" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java b/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java
index a750e72f136e..634b387142f2 100644
--- a/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java
+++ b/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java
@@ -1,5 +1,7 @@
 package com.intellij.diff.contents;
 
+import com.intellij.ide.highlighter.ProjectFileType;
+import com.intellij.lang.properties.charset.Native2AsciiCharset;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
@@ -11,6 +13,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.util.LineSeparator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -131,6 +134,10 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
       charset = currentCharset;
     }
 
+    if (ProjectFileType.INSTANCE.equals(fileType) && EncodingManager.getInstance().isNative2AsciiForPropertiesFiles()) {
+      charset = Native2AsciiCharset.wrap(charset);
+    }
+
     return charset;
   }
 }