diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilter.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilter.java index cd8a5a58660e..ca332e10247c 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilter.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilter.java @@ -49,8 +49,8 @@ public class GradleConsoleFilter implements Filter { @Nullable @Override public Result applyFilter(@NotNull final String line, final int entireLength) { - String[] filePrefixes = new String[]{"Build file '", "build file '"}; - String[] linePrefixes = new String[]{"' line: ", "': "}; + String[] filePrefixes = new String[]{"Build file '", "build file '", "Settings file '"}; + String[] linePrefixes = new String[]{"' line: ", "': ", "' line: "}; String filePrefix = null; String linePrefix = null; for (int i = 0; i < filePrefixes.length; i++) { diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java index 1944fccefba5..567d1d2f8aa1 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java @@ -27,6 +27,8 @@ public class GradleConsoleFilterTest extends CodeInsightFixtureTestCase { doTest("Build file '/project/build.gradle' line: 7", "/project/build.gradle", 7); doTest(" build file 'C:\\project\\build.gradle': 49: unexpected token: 5 @ line 49, column 28.", "C:\\project\\build.gradle", 49); doTest("build file 'C:\\project\\build.gradle': 49: unexpected token: 5 @ line 49, column 28.", "C:\\project\\build.gradle", 49); + doTest("Settings file 'C:\\project\\settings.gradle' line: 7", "C:\\project\\settings.gradle", 7); + doTest("Settings file '/project/settings.gradle' line: 7", "/project/settings.gradle", 7); } private void doTest(String line, String expectedFileName, int expectedLineNumber) {