From 6e9efefd2aca6d39baf16a5cad150c5821a01451 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 19 Jun 2020 16:59:55 +0300 Subject: [PATCH] gradle scripts: fix isFirstLoadActual and notification typos --- .../core/script/configuration/DefaultScriptingSupport.kt | 2 +- .../res/messages/KotlinIdeaGradleBundle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt index 48bb639172d..e6ae19099bb 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt @@ -178,7 +178,7 @@ class DefaultScriptingSupport(manager: CompositeScriptConfigurationManager) : De val forceSkipNotification = skipNotification || autoReloadEnabled // sync loaders can do something, let's recheck - val isFirstLoadActual = getCachedConfigurationState(virtualFile)?.applied != null + val isFirstLoadActual = getCachedConfigurationState(virtualFile)?.applied == null val intercepted = !forceSkipNotification && async.any { it.interceptBackgroundLoading(virtualFile, isFirstLoadActual) { diff --git a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties index 329ca3814f4..d5725b6c359 100644 --- a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties +++ b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties @@ -1,12 +1,12 @@ notification.oldGradle.firstLoad=Code insight is disabled to avoid Gradle build configuration notification.oldGradle.firstLoad.info=
\ -

The Gradle configuration phase required to be run to get Script Configuration. \ +

The Gradle configuration phase is required to be run to get the Script Configuration \ It is disabled by default since it can be expensive for large Gradle projects.

\
\ -

Click "Load Configuration" to load evaluate Gradle build scripts.

\ +

Click "Load Configuration" to evaluate Gradle build scripts.

\
\

Alternatively, you can "Enable auto-reload" for all files to automatically load \ - configuration on the first opening and reload it on each change of build script configuration blocks.\ + configuration on the first opening and reload it on each change of build script configuration blocks. \ This option is not recommended for a big Gradle project with a long configuration time.

\
gradle.script.configurations.importing.feature=Load gradle kotlin scripts configuration from project importing