diff --git a/ChangeLog.md b/ChangeLog.md index 228c63c8a62..9ac2b5ead98 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -45,7 +45,8 @@ Issues fixed: - [KT-10174](https://youtrack.jetbrains.com/issue/KT-10174) Optimize imports after applying "Move declaration to separate file" intention - [KT-12035](https://youtrack.jetbrains.com/issue/KT-12035) Auto-format cast expressions - [KT-12018](https://youtrack.jetbrains.com/issue/KT-12018) Auto-format spaces between function name and arguments in infix calls -- [KT-12067](https://youtrack.jetbrains.com/issue/KT-12067) Deadlock in Kotlin debugger fixed +- [KT-12067](https://youtrack.jetbrains.com/issue/KT-12067) Deadlock in Kotlin debugger is fixed +- [KT-12070](https://youtrack.jetbrains.com/issue/KT-12070) Add empty line in error message of Maven and Gradle configuration #### Debugger diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt index 632879666aa..64b21e3c79d 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt @@ -183,8 +183,8 @@ abstract class KotlinMavenConfigurator protected constructor(private val stdlibA private fun showErrorMessage(project: Project, message: String?) { Messages.showErrorDialog(project, "Couldn't configure kotlin-maven plugin automatically.
" + - (message ?: "") + - "See manual installation instructions here", + (if (message != null) "$message
" else "") + + "See manual installation instructions here.", "Configure Kotlin-Maven Plugin") } } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java index 3f689ccc79d..2a4b552be2e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java @@ -474,8 +474,8 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi private static void showErrorMessage(@NotNull Project project, @Nullable String message) { Messages.showErrorDialog(project, "Couldn't configure kotlin-gradle plugin automatically.
" + - (message != null ? message : "") + - "See manual installation instructions here", + (message != null ? (message + "
") : "") + + "
See manual installation instructions here.", "Configure Kotlin-Gradle Plugin"); } }