From ccbda8b2094463be54ad93dd66574fb9d5e17f47 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Wed, 12 May 2021 21:05:17 +0300 Subject: [PATCH] IDEA-245204 Build tools: Maven/Gradle panel is opened after new project creation GitOrigin-RevId: 9c54d3eb702c34a8ad6624fb00f51158bc4435ca --- .../externalSystem/service/ui/ExternalToolWindowManager.java | 4 +++- .../idea/maven/navigator/MavenProjectsNavigator.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java index eac75754b7f1..8ae1fe23174d 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java @@ -4,6 +4,7 @@ package com.intellij.openapi.externalSystem.service.ui; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.externalSystem.ExternalSystemManager; +import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys; import com.intellij.openapi.externalSystem.model.ProjectSystemId; import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemSettings; import com.intellij.openapi.externalSystem.settings.ExternalSystemSettingsListenerAdapter; @@ -38,7 +39,8 @@ public final class ExternalToolWindowManager { public void onProjectsLinked(@NotNull Collection linked) { Consumer activate = (toolWindow) -> toolWindow.setAvailable(true, () -> { - boolean shouldShow = settings.getLinkedProjectsSettings().size() == 1; + boolean shouldShow = settings.getLinkedProjectsSettings().size() == 1 + && project.getUserData(ExternalSystemDataKeys.NEWLY_CREATED_PROJECT) == null; if (shouldShow) { toolWindow.show(null); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java index f7bd2827a3ed..8361fd0f5d0b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java @@ -12,6 +12,7 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StoragePathMacros; +import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ex.ProjectRootManagerEx; @@ -398,7 +399,8 @@ public final class MavenProjectsNavigator extends MavenSimpleProjectComponent im boolean hasMavenProjects = !MavenProjectsManager.getInstance(myProject).getProjects().isEmpty(); if (toolWindow.isAvailable() != hasMavenProjects) { toolWindow.setAvailable(hasMavenProjects); - if (hasMavenProjects) { + if (hasMavenProjects + && myProject.getUserData(ExternalSystemDataKeys.NEWLY_CREATED_PROJECT) == null) { toolWindow.activate(null); } }