IDEA-103199 Undo: UTF problem

This commit is contained in:
Vassiliy Kudryashov
2013-12-03 18:35:06 +04:00
parent 83b6571952
commit ea49ecf435
@@ -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);