From 35d59368290bb4848931ba6e38030978b6d39fdd Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 25 Jun 2020 10:20:03 +0300
Subject: [PATCH] Wizard: add info about used Kotlin version to project test
 importing failure

---
 .../services/ProjectImportingTestWizardService.kt      | 10 +++++++++-
 .../kotlin/tools/projectWizard/core/errors.kt          |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt
index 5cdd95b838d..35130bda181 100644
--- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt
+++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/services/ProjectImportingTestWizardService.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWiz
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle
+import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import java.nio.file.Path
 
@@ -55,7 +56,14 @@ class GradleProjectImportingTestWizardService(private val project: Project) : Pr
                 }).forceWhenUptodate()
         )
 
-        return importingErrorMessage?.let { Failure(ProjectImportingError(it)) } ?: UNIT_SUCCESS
+        return importingErrorMessage?.let { message ->
+            Failure(
+                ProjectImportingError(
+                    reader { KotlinPlugin::version.propertyValue.version.toString() },
+                    message,
+                )
+            )
+        } ?: UNIT_SUCCESS
     }
 
     private fun BuildSystemType.externalSystemId() = when (this) {
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/errors.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/errors.kt
index eeba69a51bb..31dde51d300 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/errors.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/errors.kt
@@ -61,7 +61,13 @@ data class ValidationError(val validationMessage: String) : Error() {
         get() = validationMessage.capitalize()
 }
 
-data class ProjectImportingError(@Nls override val message: String) : Error()
+data class ProjectImportingError(val kotlinVersion: String, @Nls val reason: String) : Error() {
+    override val message: String
+        get() = """Project importing error
+            |Kotlin version: $kotlinVersion
+            |Reason: $reason
+        """.trimMargin()
+}
 
 data class InvalidModuleDependencyError(val from: Module, val to: Module, @Nls val reason: String? = null) : Error() {
     override val message: String