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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2016-10-31 10:25:56 +01:00
parent 428da641d7 b808d4d747
commit c838c11722
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+2 -6
View File
@@ -397,9 +397,6 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
if (encodingManager instanceof EncodingManagerImpl) ((EncodingManagerImpl)encodingManager).clearDocumentQueue();
FileDocumentManager manager = FileDocumentManager.getInstance();
ApplicationManager.getApplication().runWriteAction(EmptyRunnable.getInstance()); // Flush postponed formatting if any.
manager.saveAllDocuments();
if (manager instanceof FileDocumentManagerImpl) {
((FileDocumentManagerImpl)manager).dropAllUnsavedDocuments();
}
@@ -417,13 +414,13 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
append(() -> DocumentCommitThread.getInstance().clearQueue()).
append(() -> ((UndoManagerImpl)UndoManager.getGlobalInstance()).dropHistoryInTests()).
append(() -> ((UndoManagerImpl)UndoManager.getInstance(project)).dropHistoryInTests()).
append(() -> UIUtil.dispatchAllInvocationEvents()).
append(() -> TemplateDataLanguageMappings.getInstance(project).cleanupForNextTest()).
append(() -> ProjectManagerEx.getInstanceEx().closeTestProject(project)).
append(() -> application.setDataProvider(null)).
append(() -> ourTestCase = null).
append(() -> ((PsiManagerImpl)PsiManager.getInstance(project)).cleanupForNextTest()).
append(() -> CompletionProgressIndicator.cleanupForNextTest()).
append(() -> UIUtil.dispatchAllInvocationEvents()).
append(() -> {
if (checkForEditors) {
checkEditorsReleased();
@@ -458,7 +455,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
}
}
public static PsiDocumentManagerImpl clearUncommittedDocuments(@NotNull Project project) {
public static void clearUncommittedDocuments(@NotNull Project project) {
PsiDocumentManagerImpl documentManager = (PsiDocumentManagerImpl)PsiDocumentManager.getInstance(project);
documentManager.clearUncommittedDocuments();
@@ -467,7 +464,6 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
Project defaultProject = projectManager.getDefaultProject();
((PsiDocumentManagerImpl)PsiDocumentManager.getInstance(defaultProject)).clearUncommittedDocuments();
}
return documentManager;
}
public static void checkEditorsReleased() {