Add a Few Escaped Chars

Single & double quotes, and the backslash itself.

Bug: n/a
Test: Added
Change-Id: I1aa786b438b944bf0b5b5942e2e462eed3a27b87

2 files changed, 26 insertions, 1 deletions

diff --git a/logcat/src/com/android/tools/idea/logcat/filters/parser/PsiExtensions.kt b/logcat/src/com/android/tools/idea/logcat/filters/parser/PsiExtensions.kt
index 2c20004c0ee..dd750c819e9 100644
--- a/logcat/src/com/android/tools/idea/logcat/filters/parser/PsiExtensions.kt
+++ b/logcat/src/com/android/tools/idea/logcat/filters/parser/PsiExtensions.kt
@@ -22,7 +22,7 @@ import com.android.tools.idea.logcat.filters.parser.LogcatFilterTypes.VALUE
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.elementType
 
-private val ESCAPED_CHAR_REGEX = """\\([ :])""".toRegex()
+private val ESCAPED_CHAR_REGEX = """\\([ :'"\\])""".toRegex()
 
 /**
  * Extension functions for [PsiElement] classes.
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterParserTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterParserTest.kt
index b6c2d8ebdb6..c1a64614fe8 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterParserTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterParserTest.kt
@@ -103,6 +103,31 @@ class LogcatFilterParserTest {
   }
 
   @Test
+  fun parse_stringKey_escapeChars() {
+    for ((key, field) in KEYS) {
+      val filter = logcatFilterParser().parse("""
+        $key:foo\ bar
+        $key:'foobar'
+        $key:\'foobar\'
+        $key:"foobar"
+        $key:\"foobar\"
+        $key:foo\\bar
+      """.trimIndent())
+
+      assertThat(filter).isEqualTo(
+        AndLogcatFilter(
+          StringFilter("foo bar", field),
+          StringFilter("foobar", field),
+          StringFilter("'foobar'", field),
+          StringFilter("foobar", field),
+          StringFilter(""""foobar"""", field),
+          StringFilter("""foo\bar""", field),
+        )
+      )
+    }
+  }
+
+  @Test
   fun parse_negatedStringKey() {
     for ((key, field) in KEYS) {
       assertThat(logcatFilterParser().parse("-$key: Foo")).isEqualTo(NegatedStringFilter("Foo", field))