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

Missing new line in error message (KT-12070)

Browse Source 
#KT-12070 Fixed
This commit is contained in:
Nikolay Krasko
2016-04-27 18:15:50 +03:00
parent 018622e552
commit faa2745731
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.md
+2 -1
View File
@@ -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-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-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-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 #### Debugger
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt
+2 -2
View File
@@ -183,8 +183,8 @@ abstract class KotlinMavenConfigurator protected constructor(private val stdlibA
private fun showErrorMessage(project: Project, message: String?) { private fun showErrorMessage(project: Project, message: String?) {
Messages.showErrorDialog(project, Messages.showErrorDialog(project,
"<html>Couldn't configure kotlin-maven plugin automatically.<br/>" + "<html>Couldn't configure kotlin-maven plugin automatically.<br/>" +
(message ?: "") + (if (message != null) "$message</br>" else "") +
"See manual installation instructions <a href=\"http://confluence.jetbrains.com/display/Kotlin/Kotlin+Build+Tools#KotlinBuildTools-Maven\">here</a></html>", "See manual installation instructions <a href=\"http://confluence.jetbrains.com/display/Kotlin/Kotlin+Build+Tools#KotlinBuildTools-Maven\">here</a>.</html>",
"Configure Kotlin-Maven Plugin") "Configure Kotlin-Maven Plugin")
} }
} }
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+2 -2
View File
@@ -474,8 +474,8 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
private static void showErrorMessage(@NotNull Project project, @Nullable String message) { private static void showErrorMessage(@NotNull Project project, @Nullable String message) {
Messages.showErrorDialog(project, Messages.showErrorDialog(project,
"<html>Couldn't configure kotlin-gradle plugin automatically.<br/>" + "<html>Couldn't configure kotlin-gradle plugin automatically.<br/>" +
(message != null ? message : "") + (message != null ? (message + "<br/>") : "") +
"See manual installation instructions <a href=\"https://kotlinlang.org/docs/reference/using-gradle.html\">here</a></html>", "<br/>See manual installation instructions <a href=\"https://kotlinlang.org/docs/reference/using-gradle.html\">here</a>.</html>",
"Configure Kotlin-Gradle Plugin"); "Configure Kotlin-Gradle Plugin");
} }
} }