From 89f50186d43e859f3b22615c1c42012812214271 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 4 Jun 2014 16:47:05 +0400 Subject: [PATCH 1/2] imports optimized --- .../quickfix/SurroundWithQuotesAnnotationParameterValueFix.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java index a920d16126e0..0468ec844a1a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java @@ -20,7 +20,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; From a109c223e46815d58e2ddd2a6322ba5fb328347d Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 4 Jun 2014 16:48:22 +0400 Subject: [PATCH 2/2] IDEA-121370 Failed Gradle task doesn't block the dependent run configurations --- .../service/execution/ExternalSystemRunConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java index f9996a9d9ae5..4c27ae11a446 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java @@ -215,7 +215,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase { String exceptionMessage = ExceptionUtil.getMessage(e); String text = exceptionMessage == null ? e.toString() : exceptionMessage; processHandler.notifyTextAvailable(text + '\n', ProcessOutputTypes.STDERR); - processHandler.notifyProcessTerminated(0); + processHandler.notifyProcessTerminated(1); } @Override