MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-11574: if rake execution has output in stderr but exit status is 0 we show it as list of warnings.

Browse Source 
#RUBY-11574 fixed
This commit is contained in:
Oleg Sukhodolsky
2012-09-20 17:24:25 +04:00
parent a22470cdad
commit 4c09eddfee
1 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
+47 -15
View File
@@ -46,6 +46,7 @@ import com.intellij.ui.content.Content;
import com.intellij.ui.content.ContentFactory;
import com.intellij.ui.content.ContentManager;
import com.intellij.ui.content.MessageView;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import com.intellij.util.Function;
import com.intellij.util.NotNullFunction;
@@ -74,17 +75,29 @@ public class ExecutionHelper {
private ExecutionHelper() {
}
public static void showErrors(@NotNull final Project myProject,
@NotNull final List<Exception> exceptionList,
@NotNull final String tabDisplayName,
@Nullable final VirtualFile file) {
if (ApplicationManager.getApplication().isUnitTestMode() && !exceptionList.isEmpty()) {
throw new RuntimeException(exceptionList.get(0));
public static void showErrors(
@NotNull final Project myProject,
@NotNull final List<Exception> errors,
@NotNull final String tabDisplayName,
@Nullable final VirtualFile file)
{
showExceptions(myProject, errors, Collections.<Exception>emptyList(), tabDisplayName, file);
}
public static void showExceptions(
@NotNull final Project myProject,
@NotNull final List<Exception> errors,
@NotNull final List<Exception> warnings,
@NotNull final String tabDisplayName,
@Nullable final VirtualFile file)
{
if (ApplicationManager.getApplication().isUnitTestMode() && !errors.isEmpty()) {
throw new RuntimeException(errors.get(0));
}
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
if (myProject.isDisposed()) return;
if (exceptionList.isEmpty()) {
if (errors.isEmpty() && warnings.isEmpty()) {
removeContents(null, myProject, tabDisplayName);
return;
}
@@ -95,25 +108,44 @@ public class ExecutionHelper {
}
catch (NullPointerException e) {
final StringBuilder builder = new StringBuilder();
builder.append("Exceptions occured:");
for (final Exception exception : exceptionList) {
builder.append("Exceptions occurred:");
for (final Exception exception : errors) {
builder.append("\n");
builder.append(exception.getMessage());
}
builder.append("Warnings occurred:");
for (final Exception exception : warnings) {
builder.append("\n");
builder.append(exception.getMessage());
}
Messages.showErrorDialog(builder.toString(), "Execution Error");
return;
}
for (final Exception exception : exceptionList) {
String[] messages = StringUtil.splitByLines(exception.getMessage());
if (messages.length == 0) messages = new String[]{"Unknown Error"};
errorTreeView.addMessage(MessageCategory.ERROR, messages, file, -1, -1, null);
}
addMessages(MessageCategory.ERROR, errors, errorTreeView, file, "Unknown Error");
addMessages(MessageCategory.WARNING, warnings, errorTreeView, file, "Unknown Warning");
ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.MESSAGES_WINDOW).activate(null);
}
});
}
private static void addMessages(
final int messageCategory,
@NotNull final List<Exception> exceptions,
@NotNull ErrorViewPanel errorTreeView,
@NotNull final VirtualFile file,
@NotNull final String defaultMessage)
{
for (final Exception exception : exceptions) {
String[] messages = StringUtil.splitByLines(exception.getMessage());
if (messages.length == 0) {
messages = new String[] { defaultMessage };
}
errorTreeView.addMessage(messageCategory, messages, file, -1, -1, null);
}
}
public static void showOutput(@NotNull final Project myProject,
@NotNull final Output output,
@NotNull final String tabDisplayName,
@@ -171,7 +203,7 @@ public class ExecutionHelper {
}
else {
errorTreeView.addMessage(MessageCategory.SIMPLE, new String[]{stderrTitle}, file, -1, -1, null);
errorTreeView.addMessage(MessageCategory.SIMPLE, new String[0], file, -1, -1, null);
errorTreeView.addMessage(MessageCategory.SIMPLE, ArrayUtil.EMPTY_STRING_ARRAY, file, -1, -1, null);
errorTreeView.addMessage(MessageCategory.SIMPLE, stderrLines, file, -1, -1, null);
}
}