diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilterModel.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilterModel.java index f354a79e2d9e..e2b0a45d40f3 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilterModel.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilterModel.java @@ -77,5 +77,6 @@ public abstract class LogFilterModel { public abstract void selectFilter(LogFilter filter); + @Nullable public abstract Key processLine(String line); } diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java index 4e6c412508c8..7fcdaf6a8b4c 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java @@ -288,7 +288,10 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L } else { if (myModel.isApplicable(text)) { - myProcessHandler.notifyTextAvailable(text + "\n", myModel.processLine(text)); + Key key = myModel.processLine(text); + if (key != null) { + myProcessHandler.notifyTextAvailable(text + "\n", key); + } } myOriginalDocument = getOriginalDocument(); if (myOriginalDocument != null) { @@ -372,7 +375,12 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L } else if (isApplicable.value(line)) { Key key = myModel.processLine(line); - myConsole.print(line + "\n", ConsoleViewContentType.getConsoleViewType(key)); + if (key != null) { + ConsoleViewContentType type = ConsoleViewContentType.getConsoleViewType(key); + if (type != null) { + myConsole.print(line + "\n", type); + } + } } return true; }