IDEA-83565 fix filtering by log level in android logcat

plugins/android/src/org/jetbrains/android/logcat/AndroidLogFilterModel.java

@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
  */
 public abstract class AndroidLogFilterModel extends LogFilterModel {
   static final Pattern ANDROID_LOG_MESSAGE_PATTERN =
-    Pattern.compile("\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d+:\\s+[A-Z]+/([\\S ]+)\\((\\d+)\\):(.*)");
+    Pattern.compile("\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d+:\\s+([A-Z]+)/([\\S ]+)\\((\\d+)\\):(.*)");
 
   private final List<LogFilterListener> myListeners = new ArrayList<LogFilterListener>();
 
@@ -138,6 +138,7 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
     }
 
 
+    Log.LogLevel logLevel = null;
     String tag = null;
     String pid = null;
     String message = text;
@@ -145,16 +146,21 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
     final Matcher matcher = ANDROID_LOG_MESSAGE_PATTERN.matcher(text);
     if (matcher.matches()) {
       String s = matcher.group(1).trim();
+      if (s.length() > 0) {
+        logLevel = getLogLevel(s);
+      }
+
+      s = matcher.group(2).trim();
       if (s.length() > 0) {
         tag = s;
       }
       
-      s = matcher.group(2).trim();
+      s = matcher.group(3).trim();
       if (s.length() > 0) {
         pid = s;
       }
       
-      s = matcher.group(3).trim();
+      s = matcher.group(4).trim();
       if (s.length() > 0) {
         message = s;
       }
@@ -167,8 +173,10 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
     if (pid == null) {
       pid = myPrevPid;
     }
-
-    return configuredFilterName.isApplicable(message, tag, pid, getLogLevel(text));
+    if (logLevel == null) {
+      logLevel = myPrevMessageLogLevel;
+    }
+    return configuredFilterName.isApplicable(message, tag, pid, logLevel);
   }
 
   public List<? extends LogFilter> getLogFilters() {
@@ -185,18 +193,27 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
 
     @Override
     public boolean isAcceptable(String line) {
-      Log.LogLevel logLevel = getLogLevel(line);
+      final Matcher matcher = ANDROID_LOG_MESSAGE_PATTERN.matcher(line);
+      Log.LogLevel logLevel = null;
+
+      if (matcher.matches()) {
+        logLevel = getLogLevel(matcher.group(1));
+      }
+      if (logLevel == null) {
+        logLevel = myPrevMessageLogLevel;
+      }
       return logLevel != null && logLevel.getPriority() >= myLogLevel.getPriority();
     }
   }
 
   @Nullable
-  Log.LogLevel getLogLevel(String line) {
-    Log.LogLevel logLevel = AndroidLogcatUtil.getLogLevel(line);
-    if (logLevel == null) {
-      logLevel = myPrevMessageLogLevel;
+  private static Log.LogLevel getLogLevel(@NotNull String name) {
+    for (Log.LogLevel level : Log.LogLevel.values()) {
+      if (name.equals(level.name())) {
+        return level;
+      }
     }
-    return logLevel;
+    return null;
   }
 
   public boolean isFilterSelected(LogFilter filter) {
@@ -226,24 +243,24 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
     final boolean messageHeader = matcher.matches();
 
     if (messageHeader) {
-      String s = matcher.group(1).trim();
+      String s = matcher.group(1);
+      if (s.length() > 0) {
+        final Log.LogLevel logLevel = getLogLevel(s);
+        if (logLevel != null) {
+          myPrevMessageLogLevel = logLevel;
+        }
+      }
+
+      s = matcher.group(2).trim();
       if (s.length() > 0) {
         myPrevTag = s;
       }
       
-      s = matcher.group(2).trim();
+      s = matcher.group(3).trim();
       if (s.length() > 0) {
         myPrevPid = s;
       }
     }
-    
-    Log.LogLevel logLevel = AndroidLogcatUtil.getLogLevel(line);
-    if (logLevel != null) {
-      myPrevMessageLogLevel = logLevel;
-    }
-    final Key key = myPrevMessageLogLevel != null ? getProcessOutputType(myPrevMessageLogLevel) : ProcessOutputTypes.STDOUT;
-    
-    
     final boolean applicable = isApplicable(line); 
     final boolean applicableByCustomFilter = isApplicableByCustomFilter(line);
 
@@ -266,6 +283,7 @@ public abstract class AndroidLogFilterModel extends LogFilterModel {
       myFullMessageApplicable = myFullMessageApplicable || applicable;
       myFullMessageApplicableByCustomFilter = myFullMessageApplicableByCustomFilter || applicableByCustomFilter;
     }
+    final Key key = myPrevMessageLogLevel != null ? getProcessOutputType(myPrevMessageLogLevel) : ProcessOutputTypes.STDOUT;
     
     return new MyProcessingResult(key,
                                   myFullMessageApplicable && myFullMessageApplicableByCustomFilter,

plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatUtil.java

@@ -45,36 +45,21 @@ import java.util.Map;
  */
 public class AndroidLogcatUtil {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.run.AndroidDebugRunner");
-  private static Map<String, Log.LogLevel> LOG_LEVELS;
-  private static int minLogLevelNameLength;
-  private static int maxLogLevelNameLength;
+  private static Map<String, Log.LogLevel> ourLogLevels;
 
   private AndroidLogcatUtil() {
   }
 
   @Nullable
-  public synchronized static Log.LogLevel getLogLevel(String message) {
-    if (LOG_LEVELS == null) {
-      LOG_LEVELS = new HashMap<String, Log.LogLevel>();
+  public synchronized static Log.LogLevel getLogLevel(String s) {
+    if (ourLogLevels == null) {
+      ourLogLevels = new HashMap<String, Log.LogLevel>();
+
       for (Log.LogLevel level : Log.LogLevel.values()) {
-        String name = level.name();
-        if (minLogLevelNameLength == 0 || name.length() < minLogLevelNameLength) {
-          minLogLevelNameLength = name.length();
-        }
-        if (name.length() > maxLogLevelNameLength) {
-          maxLogLevelNameLength = name.length();
-        }
-        LOG_LEVELS.put(name, level);
+        ourLogLevels.put(level.name(), level);
       }
     }
-    for (int i = 0, n = message.length(); i < n; i++) {
-      for (int j = i + minLogLevelNameLength; j <= i + maxLogLevelNameLength && j < n; j++) {
-        String s = message.substring(i, j);
-        Log.LogLevel logLevel = LOG_LEVELS.get(s);
-        if (logLevel != null) return logLevel;
-      }
-    }
-    return null;
+    return ourLogLevels.get(s);
   }
 
   private static void startLogging(IDevice device, AndroidOutputReceiver receiver)

plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java

@@ -143,12 +143,12 @@ class EditLogFilterDialog extends DialogWrapper {
         continue;
       }
 
-      final String tag = matcher.group(1).trim();
+      final String tag = matcher.group(2).trim();
       if (tag != null && tag.length() > 0) {
         tagSet.add(tag);
       }
 
-      final String pid = matcher.group(2).trim();
+      final String pid = matcher.group(3).trim();
       if (pid != null && pid.length() > 0) {
         try {
           Integer.parseInt(pid);