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

IJPL-162718 fix GradleKotlinNewProjectWizardTest

Browse Source 
GitOrigin-RevId: f0c2977b9b14906f289754c602063cc28c490a81
This commit is contained in:
Vladimir Krivosheev
2024-10-14 22:49:12 +00:00
committed by intellij-monorepo-bot
parent b794f4bf3c
commit 837cdcffe7
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java
+21 -10
View File
@@ -185,7 +185,7 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule
}
@Override
protected void setupModule(Module module) throws ConfigurationException {
protected void setupModule(@NotNull Module module) throws ConfigurationException {
super.setupModule(module);
assert rootProjectPath != null;
@@ -222,19 +222,30 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule
project.putUserData(ExternalSystemDataKeys.NEWLY_IMPORTED_PROJECT, Boolean.TRUE);
}
// execute when current dialog is closed
// execute when the current dialog is closed
ApplicationManager.getApplication().invokeLater(() -> {
if (isCreatingBuildScriptFile) {
preImportConfigurators.forEach(c -> c.accept(buildScriptFile, settingsScriptFile));
openBuildScriptFile(project, buildScriptFile);
}
if (isCreatingNewLinkedProject() && gradleDistributionType.isWrapped()) {
generateGradleWrapper(project);
}
reloadProject(project);
finishModuleSetup(buildScriptFile, project);
}, ModalityState.nonModal(), project.getDisposed());
}
private void finishModuleSetup(@Nullable VirtualFile buildScriptFile, @NotNull Project project) {
if (!project.isOpen()) {
ApplicationManager.getApplication().invokeLater(() -> finishModuleSetup(buildScriptFile, project),
ModalityState.nonModal(),
project.getDisposed());
return;
}
if (isCreatingBuildScriptFile) {
preImportConfigurators.forEach(c -> c.accept(buildScriptFile, settingsScriptFile));
openBuildScriptFile(project, buildScriptFile);
}
if (isCreatingNewLinkedProject() && gradleDistributionType.isWrapped()) {
generateGradleWrapper(project);
}
reloadProject(project);
}
private void reloadProject(@NotNull Project project) {
ExternalProjectsManagerImpl.getInstance(project).runWhenInitialized(() -> {
ImportSpecBuilder importSpec = new ImportSpecBuilder(project, GradleConstants.SYSTEM_ID);