IDEA-103199 Undo: UTF problem

(cherry picked from commit ea49ecf4) (cherry picked from commit 75ed5963)

IDEA-103199 Undo: UTF problem
(cherry picked from commit ea49ecf4) (cherry picked from commit 75ed5963)
a6ec0c89 · Vassiliy Kudryashov · e87f87f2 · a6ec0c89
Commit a6ec0c89 authored 11 years ago by Vassiliy Kudryashov
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
@@ -52,8 +52,10 @@ public class EditorChangeAction extends BasicUndoableAction {
                            long oldTimeStamp) {
    super(document);

-    Charset charset = EncodingManager.getInstance().getEncoding(FileDocumentManager.getInstance().getFile(document), false);
-    myCharset = charset == null ? Charset.defaultCharset() : charset;
+    Charset charset = EncodingManager.getInstance().getEncoding(FileDocumentManager.getInstance().getFile(document), true);
+    if (charset == null) charset = EncodingManager.getInstance().getDefaultCharset();
+    if (charset == null) charset = Charset.defaultCharset();
+    myCharset = charset;

    myOffset = offset;
    myOldString = oldString == null ? "" : compressCharSequence(oldString, myCharset);