From c88b11aa27118f02189772671aaf8e793b958e6b Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 25 Nov 2016 15:15:06 +0100 Subject: [PATCH] Generalize error processing in retrieving gradle settings, fixes #EA-87096, #EA-87129, #EA-87275 and alike --- .../kotlin/idea/core/script/gradleScriptTemplateProvider.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt index adec3a632d9..591254818d0 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt @@ -38,15 +38,11 @@ class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider { com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.toCanonicalPath(project.basePath!!), org.jetbrains.plugins.gradle.util.GradleConstants.SYSTEM_ID) } - catch (e: NoClassDefFoundError) { + catch (e: Throwable) { // TODO: consider displaying the warning to the user Logger.getInstance(GradleScriptTemplatesProvider::class.java).warn("[kts] Cannot get gradle execution settings", e) null } - catch (e: ClassNotFoundException) { - Logger.getInstance(GradleScriptTemplatesProvider::class.java).warn("[kts] Cannot get gradle execution settings", e) - null // see todo above - } } private val gradleJvmOptions: List by lazy {