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

start project dispose under write action

Browse Source 
GitOrigin-RevId: a96d6ceeea5e6111df5629196747a55672d20b18
This commit is contained in:
Vladimir Krivosheev
2019-12-20 19:31:06 +00:00
committed by intellij-monorepo-bot
parent 6204c4b129
commit 45eabcf65f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+4 -4
View File
@@ -719,11 +719,11 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
((ProjectImpl)project).disposeEarlyDisposable();
}
if (dispose && project instanceof ProjectImpl) {
((ProjectImpl)project).startDispose();
}
app.runWriteAction(() -> {
if (dispose && project instanceof ProjectImpl) {
((ProjectImpl)project).startDispose();
}
removeFromOpened(project);
fireProjectClosed(project);
platform/platform-tests/testSrc/com/intellij/openapi/components/impl/OverwriteProjectConfigurationTest.java
+3 -2
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.module.ModuleTypeId;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ex.ProjectEx;
import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.util.Disposer;
import com.intellij.testFramework.HeavyPlatformTestCase;
@@ -41,7 +42,7 @@ public class OverwriteProjectConfigurationTest extends HeavyPlatformTestCase {
Disposer.dispose(disposable);
}
Project recreated = ProjectManagerEx.getInstanceEx().newProjectForTest(myProjectDir, myProject);
Project recreated = ProjectManagerEx.getInstanceEx().newProjectForTest(myProjectDir, ((ProjectEx)myProject).getEarlyDisposable());
PlatformTestUtil.saveProject(recreated);
assertThat(ModuleManager.getInstance(recreated).getModules()).isEmpty();
}
@@ -58,7 +59,7 @@ public class OverwriteProjectConfigurationTest extends HeavyPlatformTestCase {
Disposer.dispose(disposable);
}
Project recreated = ProjectManagerEx.getInstanceEx().newProjectForTest(myProjectDir, myProject);
Project recreated = ProjectManagerEx.getInstanceEx().newProjectForTest(myProjectDir, ((ProjectEx)myProject).getEarlyDisposable());
createModule(recreated, "module", ModuleTypeId.WEB_MODULE);
PlatformTestUtil.saveProject(recreated);
Module module = assertOneElement(ModuleManager.getInstance(recreated).getModules());