diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt index 66e80bbf0dd..ad23a5c757c 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.vfs.VfsUtil import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel import org.jetbrains.kotlin.gradle.BrokenKotlinDslScriptsModel +import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle import org.jetbrains.kotlin.idea.scripting.gradle.getGradleScriptInputsStamp import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager import org.jetbrains.plugins.gradle.model.BuildScriptClasspathModel @@ -72,7 +73,11 @@ fun processScriptModel( it.failed = true } } - handleError(project, errors) + throw IllegalStateException( + KotlinIdeaGradleBundle.message("title.kotlin.build.script") + + ":\n" + + errors.joinToString("\n") { it.text + "\n" + it.details } + ) } errors.isEmpty() } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt deleted file mode 100644 index c67b594abe7..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.scripting.gradle.importing - -import com.intellij.build.BuildContentManager -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle -import org.jetbrains.kotlin.idea.util.application.invokeLater -import org.jetbrains.kotlin.idea.util.application.isUnitTestMode - -internal fun handleError(project: Project, errors: List) { - if (isUnitTestMode()) { - throw IllegalStateException( - KotlinIdeaGradleBundle.message("title.kotlin.build.script") - + ":\n" - + errors.joinToString("\n") { it.text + "\n" + it.details } - ) - } - invokeLater(project.disposed) { - BuildContentManager.getInstance(project).orCreateToolWindow.activate(null, false, false) - } -} diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193 deleted file mode 100644 index 732dbf3a34e..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessorCompat.kt.193 +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.scripting.gradle.importing - -import com.intellij.build.BuildContentManager -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.util.application.invokeLater -import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle - -// FIX ME WHEN BUNCH 193 REMOVED -internal fun handleError(project: Project, errors: List) { - throw IllegalStateException( - KotlinIdeaGradleBundle.message("title.kotlin.build.script") - + ":\n" - + errors.joinToString("\n") { it.text + "\n" + it.details } - ) -}