MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-103600 UNDO error: Whenever I entered ctrl+z, this always worked. Since the last 2 EAP versions it is problematic

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-04-11 15:21:00 +04:00
parent 176d346c0b
commit aa5ce7b953
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java
+11 -6
View File
@@ -210,17 +210,22 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager {
@Override
public void setEncoding(@Nullable final VirtualFile virtualFileOrDir, @Nullable final Charset charset) {
Charset oldCharset;
if (charset == null) {
myMapping.remove(virtualFileOrDir);
oldCharset = myMapping.remove(virtualFileOrDir);
}
else {
myMapping.put(virtualFileOrDir, charset);
oldCharset = myMapping.put(virtualFileOrDir, charset);
}
myModificationCount++;
if (virtualFileOrDir != null) {
virtualFileOrDir.setCharset(virtualFileOrDir.getBOM() == null ? charset : null);
if (!Comparing.equal(oldCharset, charset)) {
myModificationCount++;
if (virtualFileOrDir != null) {
virtualFileOrDir.setCharset(virtualFileOrDir.getBOM() == null ? charset : null);
}
reloadAllFilesUnder(virtualFileOrDir);
}
reloadAllFilesUnder(virtualFileOrDir);
}
private static void clearAndReload(@NotNull VirtualFile virtualFileOrDir) {