DEBUG log pattern

diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java
index afa0dc3d73ef335b0c4e5c1f68434b7fee0ad0aa..199abadd53176a15037368a955643999df1c0179 100644 (file)
--- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java
+++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java
@@ -45,17 +45,21 @@ public class LogConsolePreferences extends LogFilterRegistrar {
   public boolean FILTER_ERRORS = false;
   public boolean FILTER_WARNINGS = false;
   public boolean FILTER_INFO = true;
+  public boolean FILTER_DEBUG = true;
+
   public String CUSTOM_FILTER = null;
   @NonNls public static final String ERROR = "ERROR";
   @NonNls public static final String WARNING = "WARNING";
   @NonNls private static final String WARN = "WARN";
   @NonNls public static final String INFO = "INFO";
+  @NonNls public static final String DEBUG = "DEBUG";
   @NonNls public static final String CUSTOM = "CUSTOM";
 
   public final static Pattern ERROR_PATTERN = Pattern.compile(".*" + ERROR + ".*");
   public final static Pattern WARNING_PATTERN = Pattern.compile(".*" + WARNING + ".*");
   public final static Pattern WARN_PATTERN = Pattern.compile(".*" + WARN + ".*");
   public final static Pattern INFO_PATTERN = Pattern.compile(".*" + INFO + ".*");
+  public static final Pattern DEBUG_PATTERN = Pattern.compile(".*" + DEBUG + ".*");
 
   @NonNls public final static Pattern EXCEPTION_PATTERN = Pattern.compile(".*at .*");
 
@@ -98,6 +102,9 @@ public class LogConsolePreferences extends LogFilterRegistrar {
     if (type.equals(INFO)) {
       return !FILTER_INFO;
     }
+    if (type.equals(DEBUG)) {
+      return !FILTER_DEBUG;
+    }
     return true;
   }
 
@@ -111,12 +118,13 @@ public class LogConsolePreferences extends LogFilterRegistrar {
     if (ERROR_PATTERN.matcher(text.toUpperCase()).matches()) return ERROR;
     if (WARNING_PATTERN.matcher(text.toUpperCase()).matches() || WARN_PATTERN.matcher(text.toUpperCase()).matches()) return WARNING;
     if (INFO_PATTERN.matcher(text.toUpperCase()).matches()) return INFO;
+    if (DEBUG_PATTERN.matcher(text.toUpperCase()).matches()) return DEBUG;
     return null;
   }
 
   public static Key getProcessOutputTypes(String type) {
     if (type.equals(ERROR)) return ProcessOutputTypes.STDERR;
-    if (type.equals(WARNING) || type.equals(INFO)) return ProcessOutputTypes.STDOUT;
+    if (type.equals(WARNING) || type.equals(INFO) || type.equals(DEBUG)) return ProcessOutputTypes.STDOUT;
     return null;
   }
 

diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/DefaultLogFilterModel.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/DefaultLogFilterModel.java
index 33b53c6a0914773bb3dad79b1eb0bc960d25b139..d2076ede86e2be8464d533772de65c707284d7aa 100644 (file)
--- a/platform/lang-impl/src/com/intellij/diagnostic/logging/DefaultLogFilterModel.java
+++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/DefaultLogFilterModel.java
@@ -71,11 +71,26 @@ public class DefaultLogFilterModel extends LogFilterModel {
         prefs.FILTER_ERRORS = false;
         prefs.FILTER_INFO = false;
         prefs.FILTER_WARNINGS = false;
+        prefs.FILTER_DEBUG = false;
       }
 
       @Override
       public boolean isSelected() {
-        return !prefs.FILTER_ERRORS && !prefs.FILTER_INFO && !prefs.FILTER_WARNINGS;
+        return !prefs.FILTER_ERRORS && !prefs.FILTER_INFO && !prefs.FILTER_WARNINGS && !prefs.FILTER_DEBUG;
+      }
+    });
+    filters.add(new MyFilter(DiagnosticBundle.message("log.console.filter.show.errors.warnings.and.infos"), prefs) {
+      @Override
+      public void selectFilter() {
+        prefs.FILTER_ERRORS = false;
+        prefs.FILTER_INFO = false;
+        prefs.FILTER_WARNINGS = false;
+        prefs.FILTER_DEBUG = true;
+      }
+
+      @Override
+      public boolean isSelected() {
+        return !prefs.FILTER_ERRORS && !prefs.FILTER_INFO && !prefs.FILTER_WARNINGS && prefs.FILTER_DEBUG;
       }
     });
     filters.add(new MyFilter(DiagnosticBundle.message("log.console.filter.show.errors.and.warnings"), prefs) {
@@ -84,11 +99,12 @@ public class DefaultLogFilterModel extends LogFilterModel {
         prefs.FILTER_ERRORS = false;
         prefs.FILTER_INFO = true;
         prefs.FILTER_WARNINGS = false;
+        prefs.FILTER_DEBUG = true;
       }
 
       @Override
       public boolean isSelected() {
-        return !prefs.FILTER_ERRORS && prefs.FILTER_INFO && !prefs.FILTER_WARNINGS;
+        return !prefs.FILTER_ERRORS && prefs.FILTER_INFO && !prefs.FILTER_WARNINGS && prefs.FILTER_DEBUG;
       }
     });
     filters.add(new MyFilter(DiagnosticBundle.message("log.console.filter.show.errors"), prefs) {
@@ -97,11 +113,12 @@ public class DefaultLogFilterModel extends LogFilterModel {
         prefs.FILTER_ERRORS = false;
         prefs.FILTER_INFO = true;
         prefs.FILTER_WARNINGS = true;
+        prefs.FILTER_DEBUG = true;
       }
 
       @Override
       public boolean isSelected() {
-        return !prefs.FILTER_ERRORS && prefs.FILTER_INFO && prefs.FILTER_WARNINGS;
+        return !prefs.FILTER_ERRORS && prefs.FILTER_INFO && prefs.FILTER_WARNINGS && prefs.FILTER_DEBUG;
       }
     });
   }

diff --git a/platform/platform-resources-en/src/messages/DiagnosticBundle.properties b/platform/platform-resources-en/src/messages/DiagnosticBundle.properties
index 5a69a3f3088a893987d8256e9b4e1753d9478d42..ce8992946b9bcf75b6ded5c3852537f7cb347600 100644 (file)
--- a/platform/platform-resources-en/src/messages/DiagnosticBundle.properties
+++ b/platform/platform-resources-en/src/messages/DiagnosticBundle.properties
@@ -59,4 +59,5 @@ log.monitor.edit.aliases.show.all.checkbox.title=&Show All Files Coverable By Pa
 log.console.filter.show.errors=Show errors only
 log.console.filter.show.errors.and.warnings=Show errors and warnings
 log.console.filter.show.all=Show all
-title.submitting.error.report=Submitting error report
\ No newline at end of file
+title.submitting.error.report=Submitting error report
+log.console.filter.show.errors.warnings.and.infos=Show errors, warnings and infos
\ No newline at end of file