From d119298232ae31471386280b4c285e6cea236ec8 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 18 Jun 2020 18:57:12 +0300 Subject: [PATCH] Add registry key to hide new Load Script Configurations action --- .../idea/scripting/gradle/GradleImportHelper.kt.201 | 10 +++++++--- idea/resources/META-INF/extensions/ide.xml | 5 ----- idea/resources/META-INF/gradle.xml | 5 +++++ idea/resources/META-INF/gradle.xml.201 | 5 +++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 index 83ec775c980..a26d34d684d 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 @@ -16,6 +16,7 @@ import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.project.Project +import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vfs.VirtualFile import com.intellij.testFramework.LightVirtualFileBase import org.jetbrains.kotlin.idea.KotlinFileType @@ -30,6 +31,9 @@ import org.jetbrains.plugins.gradle.service.project.GradlePartialResolverPolicy import org.jetbrains.plugins.gradle.settings.GradleProjectSettings import org.jetbrains.plugins.gradle.util.GradleConstants +val scriptConfigurationsNeedToBeUpdatedBalloon + get() = Registry.`is`("kotlin.gradle.scripts.scriptConfigurationsNeedToBeUpdatedFloatingNotification", true) + fun runPartialGradleImportForAllRoots(project: Project) { GradleBuildRootsManager.getInstance(project).getAllRoots().forEach { root -> runPartialGradleImport(project, root) @@ -93,9 +97,9 @@ class LoadConfigurationAction : AnAction( } private fun getNotificationVisibility(editor: Editor): Boolean { - if (DiffUtil.isDiffEditor(editor)) { - return false - } + if (!scriptConfigurationsNeedToBeUpdatedBalloon) return false + + if (DiffUtil.isDiffEditor(editor)) return false val project = editor.project ?: return false val file = getKotlinScriptFile(editor) ?: return false diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml index b4f66121b4d..fa3f84c9e54 100644 --- a/idea/resources/META-INF/extensions/ide.xml +++ b/idea/resources/META-INF/extensions/ide.xml @@ -140,11 +140,6 @@ defaultValue="false" restartRequired="false"/> - - diff --git a/idea/resources/META-INF/gradle.xml b/idea/resources/META-INF/gradle.xml index b0e2a296925..5f9ae0f29dd 100644 --- a/idea/resources/META-INF/gradle.xml +++ b/idea/resources/META-INF/gradle.xml @@ -38,6 +38,11 @@ defaultValue="true" restartRequired="false"/> + + diff --git a/idea/resources/META-INF/gradle.xml.201 b/idea/resources/META-INF/gradle.xml.201 index 2022e33c2c2..efd20fead12 100644 --- a/idea/resources/META-INF/gradle.xml.201 +++ b/idea/resources/META-INF/gradle.xml.201 @@ -40,6 +40,11 @@ defaultValue="true" restartRequired="false"/> + +