From 493c287bb08e9c87573cc2e5db62e8c6848ee6dc Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 23 Jul 2020 00:33:20 +0300 Subject: [PATCH] Minor: fix notification text when script configuration is missing after request --- .../res/messages/KotlinIdeaGradleBundle.properties | 3 ++- .../kotlin/idea/scripting/gradle/GradleImportHelper.kt | 7 ++++--- .../idea/scripting/gradle/GradleImportHelper.kt.193 | 7 ++++--- .../gradle/GradleScriptNotificationProvider.kt | 10 +++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties index 08bfd414a74..c8878fced06 100644 --- a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties +++ b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties @@ -34,7 +34,8 @@ action.label.import.project=Import Project action.text.load.script.configurations=Load Script Configurations action.description.load.script.configurations=The Gradle Kotlin DSL script configuration has been changed. Load the changes to get code insight without importing the external Gradle project. action.label.enable.auto.import=Enable Auto-Import -notification.notEvaluatedInLastImport.text=Code insight unavailable (configuration for this script wasn't received during the last Gradle project import). +notification.notEvaluatedInLastImport.193.text=Code insight unavailable (script configuration wasn't received during the last Gradle project import). +notification.notEvaluatedInLastImport.text=Code insight unavailable (script configuration wasn't received). notification.notEvaluatedInLastImport.addAsStandaloneAction=Add to standalone scripts notification.notEvaluatedInLastImport.info=
\

The Gradle project that evaluates this script needs to be imported to have it analyzed by the IDE. \ diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt index 49effe5cd1a..1c6e85a3c9f 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt @@ -56,9 +56,10 @@ fun runPartialGradleImport(project: Project, root: GradleBuildRoot) { ) } -fun getMissingConfigurationsDescription() = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.text") -fun getMissingConfigurationActionText() = KotlinIdeaGradleBundle.message("action.text.load.script.configurations") -fun getMissingConfigurationsHelp(): String? = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.help") +fun configurationsAreMissingRequestNeeded() = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.text") +fun getConfigurationsActionText() = KotlinIdeaGradleBundle.message("action.text.load.script.configurations") +fun configurationsAreMissingRequestNeededHelp(): String? = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.help") +fun configurationsAreMissingAfterRequest(): String = KotlinIdeaGradleBundle.message("notification.notEvaluatedInLastImport.text") fun autoReloadScriptConfigurations(project: Project, file: VirtualFile): Boolean { val definition = file.findScriptDefinition(project) ?: return false diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193 index ed399de8d81..3071a48483b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.193 @@ -49,9 +49,10 @@ fun runPartialGradleImport(project: Project, root: GradleBuildRoot) { ) } -fun getMissingConfigurationsDescription() = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.193.text") -fun getMissingConfigurationActionText() = KotlinIdeaGradleBundle.message("action.label.import.project") -fun getMissingConfigurationsHelp(): String? = null +fun configurationsAreMissingRequestNeeded() = KotlinIdeaGradleBundle.message("notification.wasNotImportedAfterCreation.193.text") +fun getConfigurationsActionText() = KotlinIdeaGradleBundle.message("action.label.import.project") +fun configurationsAreMissingRequestNeededHelp(): String? = null +fun configurationsAreMissingAfterRequest(): String = KotlinIdeaGradleBundle.message("notification.notEvaluatedInLastImport.193.text") fun autoReloadScriptConfigurations(project: Project, root: GradleBuildRoot): Boolean { return ExternalSystemApiUtil diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptNotificationProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptNotificationProvider.kt index 1adb48e4bac..377075d9025 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptNotificationProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptNotificationProvider.kt @@ -46,7 +46,7 @@ class GradleScriptNotificationProvider(private val project: Project) : val build: Imported = scriptUnderRoot.nearest as? Imported ?: return val importTs = build.data.importTs if (!build.areRelatedFilesChangedBefore(file, importTs)) { - createActionLabel(getMissingConfigurationActionText()) { + createActionLabel(getConfigurationsActionText()) { rootsManager.updateStandaloneScripts { runPartialGradleImport(project, build) } @@ -107,20 +107,20 @@ class GradleScriptNotificationProvider(private val project: Project) : } } wasNotImportedAfterCreation -> EditorNotificationPanel().apply { - text(getMissingConfigurationsDescription()) - createActionLabel(getMissingConfigurationActionText()) { + text(configurationsAreMissingRequestNeeded()) + createActionLabel(getConfigurationsActionText()) { val root = scriptUnderRoot.nearest if (root != null) { runPartialGradleImport(project, root) } } - val help = getMissingConfigurationsHelp() + val help = configurationsAreMissingRequestNeededHelp() if (help != null) { contextHelp(help) } } notEvaluatedInLastImport -> EditorNotificationPanel().apply { - text(KotlinIdeaGradleBundle.message("notification.notEvaluatedInLastImport.text")) + text(configurationsAreMissingAfterRequest()) // todo: this actions will be usefull only when gradle fix https://github.com/gradle/gradle/issues/12640 // showActionsToFixNotEvaluated()