From 6fbeea6cb659cebaaee4e9b1b6b7276d67223035 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 9 Oct 2019 12:50:09 +0300 Subject: [PATCH] [Gradle] build script error parser description: add empty line after location info IDEA-209457 GitOrigin-RevId: 165e58a19193312759892b6e46d5da0491f69269 --- .../execution/build/output/GradleBuildScriptErrorParser.kt | 2 +- .../importing/GradleOutputParsersMessagesImportingTest.kt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/build/output/GradleBuildScriptErrorParser.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/build/output/GradleBuildScriptErrorParser.kt index f4f24914662b..efd03949080e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/build/output/GradleBuildScriptErrorParser.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/build/output/GradleBuildScriptErrorParser.kt @@ -44,7 +44,7 @@ class GradleBuildScriptErrorParser : BuildOutputParser { val description = StringBuilder() if (location != null) { - description.appendln(location) + description.appendln(location).appendln() } var reason = reader.readLine() ?: return false val parentId: Any diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt index ebdcaec616ba..f0090c52a186 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt @@ -74,15 +74,16 @@ open class GradleOutputParsersMessagesImportingTest : BuildViewMessagesImporting " :buildSrc:testClasses\n" + " :buildSrc:test\n" + " :buildSrc:check\n" + - " :buildSrc:build\n"; + " :buildSrc:build\n" } expectedExecutionTree += " -build.gradle\n" + " Something's wrong!" assertSyncViewTreeEquals(expectedExecutionTree) + val filePath = FileUtil.toSystemDependentName(myProjectConfig.path) assertSyncViewSelectedNode("Something's wrong!", - "Build file '${myProjectConfig.path}' line: 1\n" + + "Build file '$filePath' line: 1\n\n" + "A problem occurred evaluating root project 'project'.\n" + "> Failed to apply plugin [class 'example.SomePlugin']\n" + " > Something's wrong!\n") @@ -248,7 +249,7 @@ open class GradleOutputParsersMessagesImportingTest : BuildViewMessagesImporting @Test fun `test startup build script errors with column info`() { - importProject("apply plugin: 'java'" + + importProject("apply plugin: 'java'\n" + "dependencies { \n" + " testCompile group: 'junit', name: 'junit', version: '4.12\n" + "}")