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

EA-72909 - ISE: DocumentUndoProvider$MyEditorDocumentListener.beforeDocumentChange

Browse Source
This commit is contained in:
Dmitry Batrak
2015-09-11 16:00:02 +03:00
parent 91b6cc9363
commit b5fc4155da
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/util/FileContentUtilCore.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ public class FileContentUtilCore {
if (documentManager.isFileModified(file)) {
Document document = documentManager.getDocument(file);
if (document != null) {
documentManager.saveDocument(document);
documentManager.saveDocumentAsIs(document); // this can be called e.g. in context of undo, so we shouldn't modify document
}
}
platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
+21
View File
@@ -25,7 +25,9 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.impl.LaterInvocator;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.editor.impl.DocumentImpl;
import com.intellij.openapi.editor.impl.TrailingSpacesStripper;
import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
@@ -36,6 +38,7 @@ import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.PsiFileImpl;
@@ -51,6 +54,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
public class PsiDocumentManagerImplTest extends PlatformTestCase {
@@ -559,4 +564,20 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
assertTrue(getPsiDocumentManager().isCommitted(document));
LaterInvocator.leaveModal(dialog);
}
public void testReparseDoesNotModifyDocument() throws Exception {
VirtualFile file = createTempFile("txt", null, "foo", Charset.forName("UTF-8"));
file.putUserData(TrailingSpacesStripper.OVERRIDE_STRIP_TRAILING_SPACES_KEY, EditorSettingsExternalizable.STRIP_TRAILING_SPACES_WHOLE);
final Document document = FileDocumentManager.getInstance().getDocument(file);
assertNotNull(document);
WriteCommandAction.runWriteCommandAction(myProject, new Runnable() {
@Override
public void run() {
document.insertString(3, " ");
}
});
PsiDocumentManager.getInstance(myProject).reparseFiles(Collections.singleton(file), false);
assertEquals("foo ", VfsUtilCore.loadText(file));
}
}