From 79312ebe92d3dea069e15c6349cd8dc75e6703e1 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 5 Jul 2012 17:23:41 +0400 Subject: [PATCH] IDEA-88338 fix android logcat filtering on android 4.1 --- .../org/jetbrains/android/logcat/AndroidLogcatReceiver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatReceiver.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatReceiver.java index bfc0723dbac3..5abf7afef561 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatReceiver.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatReceiver.java @@ -35,8 +35,9 @@ import java.util.regex.Pattern; */ public class AndroidLogcatReceiver extends AndroidOutputReceiver { private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.logcat.AndroidLogcatReceiver"); - private static final Pattern LOG_PATTERN = - Pattern.compile("^\\[\\s(\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d+)\\s+(\\d*):(0x[0-9a-fA-F]+)\\s([VDIWE])/(.*)\\]$", Pattern.DOTALL); + private static Pattern LOG_PATTERN = + Pattern.compile("^\\[\\s(\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d+)\\s+(\\d*):\\s*(\\S+)\\s([VDIWEAF])/(.*)\\]$", Pattern.DOTALL); + private static final String SHIFT = " "; private LogMessageHeader myLastMessageHeader;