Change `fun getFilterName()`` to `val filterName`

Pure refactor

Bug: n/a
Test: n/a
Change-Id: I41c907d9c39003dff58d974a8b4c9906d8549cae

3 files changed, 27 insertions, 25 deletions

diff --git a/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt b/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
index 7271a8c57fe..950d4f551d8 100644
--- a/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
+++ b/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
@@ -617,11 +617,11 @@ internal class FilterTextField(
       }
 
       init {
-        val filterName = filterParser.parse(filter)?.getFilterName()
+        val filterName = filterParser.parse(filter)?.filterName
         if (filterName != null) {
           val history = AndroidLogcatFilterHistory.getInstance().items
           // If there is more than one Item with the same filterName, show the name and the filter.
-          val sameName = history.count { filterParser.parse(it)?.getFilterName() == filterName }
+          val sameName = history.count { filterParser.parse(it)?.filterName == filterName }
           filterLabel.append(filterName, NAMED_FILTER_HISTORY_ITEM_COLOR)
           val filterWithoutName = filterParser.removeFilterNames(filter)
           if (sameName > 1) {
diff --git a/logcat/src/com/android/tools/idea/logcat/filters/LogcatFilter.kt b/logcat/src/com/android/tools/idea/logcat/filters/LogcatFilter.kt
index 7b85091f9f0..8a2ebd52aaf 100644
--- a/logcat/src/com/android/tools/idea/logcat/filters/LogcatFilter.kt
+++ b/logcat/src/com/android/tools/idea/logcat/filters/LogcatFilter.kt
@@ -52,6 +52,8 @@ internal class LogcatMasterFilter(private val logcatFilter: LogcatFilter?) {
  * Matches a [LogcatMessage]
  */
 internal abstract class LogcatFilter(open val textRange: TextRange) {
+  open val filterName: String? = null
+
   abstract val displayText: String
 
   /**
@@ -64,8 +66,6 @@ internal abstract class LogcatFilter(open val textRange: TextRange) {
 
   abstract fun matches(message: LogcatMessageWrapper): Boolean
 
-  open fun getFilterName(): String? = null
-
   open fun findFilterForOffset(offset: Int): LogcatFilter? {
     return if (textRange.contains(offset)) this else null
   }
@@ -75,16 +75,18 @@ internal abstract class LogcatFilter(open val textRange: TextRange) {
   }
 }
 
-internal abstract class ParentFilter(open val filters: List<LogcatFilter>)
-  : LogcatFilter(TextRange(filters.first().textRange.startOffset, filters.last().textRange.endOffset)) {
+internal abstract class ParentFilter(children: List<LogcatFilter>)
+  : LogcatFilter(TextRange(children.first().textRange.startOffset, children.last().textRange.endOffset)) {
+  open val filters: List<LogcatFilter> = children
+
+  override val filterName: String? = children.mapNotNull { it.filterName }.lastOrNull()
+
   override val displayText: String = ""
 
   override fun prepare() {
     filters.forEach(LogcatFilter::prepare)
   }
 
-  override fun getFilterName(): String? = filters.mapNotNull { it.getFilterName() }.lastOrNull()
-
   override fun findFilterForOffset(offset: Int): LogcatFilter? {
     return if (textRange.contains(offset)) filters.firstNotNullOfOrNull { it.findFilterForOffset(offset) } else null
   }
@@ -314,11 +316,11 @@ internal data class NameFilter(
   val name: String,
   override val textRange: TextRange,
 ) : LogcatFilter(textRange) {
+  override val filterName: String = name
+
   override val displayText: String = message("logcat.filter.completion.hint.name.value", name)
 
   override fun matches(message: LogcatMessageWrapper): Boolean = true
-
-  override fun getFilterName(): String = name
 }
 
 private val EXCEPTION_LINE_PATTERN = Regex("\n\\s*at .+\\(.+\\)\n")
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterTest.kt
index 5ca79852857..23e4605e54c 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/filters/LogcatFilterTest.kt
@@ -303,39 +303,39 @@ class LogcatFilterTest {
 
   @Test
   fun getFilterName_nameFilter() {
-    assertThat(NameFilter("name", EMPTY_RANGE).getFilterName()).isEqualTo("name")
+    assertThat(NameFilter("name", EMPTY_RANGE).filterName).isEqualTo("name")
   }
 
   @Test
   fun getFilterName_simpleFilters() {
-    assertThat(StringFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(NegatedStringFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(ExactStringFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(NegatedExactStringFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(RegexFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(NegatedRegexFilter("string", TAG, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(LevelFilter(INFO, EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(AgeFilter("60s", Clock.systemDefaultZone(), EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(CrashFilter(EMPTY_RANGE).getFilterName()).isNull()
-    assertThat(StackTraceFilter(EMPTY_RANGE).getFilterName()).isNull()
+    assertThat(StringFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(NegatedStringFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(ExactStringFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(NegatedExactStringFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(RegexFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(NegatedRegexFilter("string", TAG, EMPTY_RANGE).filterName).isNull()
+    assertThat(LevelFilter(INFO, EMPTY_RANGE).filterName).isNull()
+    assertThat(AgeFilter("60s", Clock.systemDefaultZone(), EMPTY_RANGE).filterName).isNull()
+    assertThat(CrashFilter(EMPTY_RANGE).filterName).isNull()
+    assertThat(StackTraceFilter(EMPTY_RANGE).filterName).isNull()
   }
 
   @Test
   fun getFilterName_compoundFilter() {
-    assertThat(AndLogcatFilter(StringFilter("string", TAG, EMPTY_RANGE), LevelFilter(INFO, EMPTY_RANGE)).getFilterName()).isNull()
-    assertThat(OrLogcatFilter(StringFilter("string", TAG, EMPTY_RANGE), LevelFilter(INFO, EMPTY_RANGE)).getFilterName()).isNull()
+    assertThat(AndLogcatFilter(StringFilter("string", TAG, EMPTY_RANGE), LevelFilter(INFO, EMPTY_RANGE)).filterName).isNull()
+    assertThat(OrLogcatFilter(StringFilter("string", TAG, EMPTY_RANGE), LevelFilter(INFO, EMPTY_RANGE)).filterName).isNull()
     assertThat(AndLogcatFilter(
       NameFilter("name1", EMPTY_RANGE),
       StringFilter("string", TAG, EMPTY_RANGE),
       LevelFilter(INFO, EMPTY_RANGE),
       NameFilter("name2", EMPTY_RANGE),
-    ).getFilterName()).isEqualTo("name2")
+    ).filterName).isEqualTo("name2")
     assertThat(OrLogcatFilter(
       NameFilter("name1", EMPTY_RANGE),
       StringFilter("string", TAG, EMPTY_RANGE),
       LevelFilter(INFO, EMPTY_RANGE),
       NameFilter("name2", EMPTY_RANGE),
-    ).getFilterName()).isEqualTo("name2")
+    ).filterName).isEqualTo("name2")
   }
 
   @Test