azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gradle scripts: fix isFirstLoadActual and notification typos

Browse Source
This commit is contained in:
Sergey Rostov
2020-06-19 16:59:55 +03:00
parent 9f4569e5a1
commit 6e9efefd2a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt
+1 -1
View File
@@ -178,7 +178,7 @@ class DefaultScriptingSupport(manager: CompositeScriptConfigurationManager) : De
val forceSkipNotification = skipNotification || autoReloadEnabled val forceSkipNotification = skipNotification || autoReloadEnabled
// sync loaders can do something, let's recheck // 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 { val intercepted = !forceSkipNotification && async.any {
it.interceptBackgroundLoading(virtualFile, isFirstLoadActual) { it.interceptBackgroundLoading(virtualFile, isFirstLoadActual) {
idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties
+3 -3
View File
@@ -1,12 +1,12 @@
notification.oldGradle.firstLoad=Code insight is disabled to avoid Gradle build configuration notification.oldGradle.firstLoad=Code insight is disabled to avoid Gradle build configuration
notification.oldGradle.firstLoad.info=<div width=400>\ notification.oldGradle.firstLoad.info=<div width=400>\
<p>The Gradle configuration phase required to be run to get Script Configuration. \ <p>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.</p>\ It is disabled by default since it can be expensive for large Gradle projects.</p>\
<br/>\ <br/>\
<p>Click "Load Configuration" to load evaluate Gradle build scripts.</p>\ <p>Click "Load Configuration" to evaluate Gradle build scripts.</p>\
<br/>\ <br/>\
<p>Alternatively, you can "Enable auto-reload" for all files to automatically load \ <p>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.</p>\ This option is not recommended for a big Gradle project with a long configuration time.</p>\
</div> </div>
gradle.script.configurations.importing.feature=Load gradle kotlin scripts configuration from project importing gradle.script.configurations.importing.feature=Load gradle kotlin scripts configuration from project importing