Wizard: add info about used Kotlin version to project test importing failure
This commit is contained in:
+9
-1
@@ -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.ir.buildsystem.ModuleIR
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
|
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.buildSystem.isGradle
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin
|
||||||
import org.jetbrains.plugins.gradle.util.GradleConstants
|
import org.jetbrains.plugins.gradle.util.GradleConstants
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
||||||
@@ -55,7 +56,14 @@ class GradleProjectImportingTestWizardService(private val project: Project) : Pr
|
|||||||
}).forceWhenUptodate()
|
}).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) {
|
private fun BuildSystemType.externalSystemId() = when (this) {
|
||||||
|
|||||||
+7
-1
@@ -61,7 +61,13 @@ data class ValidationError(val validationMessage: String) : Error() {
|
|||||||
get() = validationMessage.capitalize()
|
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() {
|
data class InvalidModuleDependencyError(val from: Module, val to: Module, @Nls val reason: String? = null) : Error() {
|
||||||
override val message: String
|
override val message: String
|
||||||
|
|||||||
Reference in New Issue
Block a user