Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,13 @@ data class DeckNode(
return
}

if (collapsed) {
// When searching, ignore collapsed state and always search children
val searching = filter != null
if (collapsed && !searching) {
return
}
// TODO: Fix collapse/uncollapse icons showing during search even when they are not usable.
// See issue #18379 for more details.

if (node.level > 0) {
list.append(this)
Expand Down
110 changes: 110 additions & 0 deletions AnkiDroid/src/test/java/com/ichi2/libanki/DeckNodeTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/****************************************************************************************
* *
* Copyright (c) 2025 Shridhar Goel <shridhar.goel@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify it under *
* the terms of the GNU General Public License as published by the Free Software *
* Foundation; either version 3 of the License, or (at your option) any later *
* version. *
* *
* This program is distributed in the hope that it will be useful, but WITHOUT ANY *
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A *
* PARTICULAR PURPOSE. See the GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License along with *
* this program. If not, see <http://www.gnu.org/licenses/>. *
****************************************************************************************/

package com.ichi2.libanki

import anki.decks.deckTreeNode
import com.ichi2.libanki.sched.DeckNode
import org.junit.Assert.assertEquals
import org.junit.Test

class DeckNodeTest {
private fun makeNode(
name: String,
deckId: Long,
level: Int,
collapsed: Boolean = false,
children: List<DeckNode> = emptyList(),
): DeckNode {
val treeNode =
deckTreeNode {
this.name = name
this.deckId = deckId
this.level = level
this.collapsed = collapsed
children.forEach { this.children.add(it.node) }
this.reviewCount = 0
this.newCount = 0
this.learnCount = 0
this.filtered = false
}
return DeckNode(treeNode, name)
}

@Test
fun `search finds subdeck even if parent collapsed`() {
// Science::Math::Algebra::Group
val group = makeNode("Group", 4, 4)
val algebra = makeNode("Algebra", 3, 3, children = listOf(group))
val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra))
val science = makeNode("Science", 1, 1, children = listOf(math))

val results1 = science.filterAndFlatten("group")
assertEquals(listOf("Science", "Math", "Algebra", "Group"), results1.map { it.lastDeckNameComponent })

val results2 = science.filterAndFlatten("math")
assertEquals(listOf("Science", "Math"), results2.map { it.lastDeckNameComponent })
}

@Test
fun `collapsed parent hides children when not searching`() {
val group = makeNode("Group", 4, 4)
val algebra = makeNode("Algebra", 3, 3, children = listOf(group))
val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra))
val science = makeNode("Science", 1, 1, children = listOf(math))

val results = math.filterAndFlatten(null)
assertEquals(1, results.size)
assertEquals("Math", results[0].lastDeckNameComponent)
}

@Test
fun `search for non-matching term returns no results`() {
// Science::Math::Algebra::Group
val group = makeNode("Group", 4, 4)
val algebra = makeNode("Algebra", 3, 3, children = listOf(group))
val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra))
val science = makeNode("Science", 1, 1, children = listOf(math))

val results = science.filterAndFlatten("complex")
assertEquals(emptyList<String>(), results.map { it.lastDeckNameComponent })
}

@Test
fun `search for algebra shows all decks in the path`() {
// Science::Math::Algebra::Group
val group = makeNode("Group", 4, 4)
val algebra = makeNode("Algebra", 3, 3, children = listOf(group))
val math = makeNode("Math", 2, 2, collapsed = false, children = listOf(algebra))
val science = makeNode("Science", 1, 1, children = listOf(math))

val results = science.filterAndFlatten("algebra")
assertEquals(listOf("Science", "Math", "Algebra", "Group"), results.map { it.lastDeckNameComponent })
}

@Test
fun `search for non-existent path pattern returns no results`() {
// Science::Math::Algebra::Group
val group = makeNode("Group", 4, 4)
val algebra = makeNode("Algebra", 3, 3, children = listOf(group))
val math = makeNode("Math", 2, 2, collapsed = false, children = listOf(algebra))
val science = makeNode("Science", 1, 1, children = listOf(math))

val results = science.filterAndFlatten("th::alg")
assertEquals(emptyList<String>(), results.map { it.lastDeckNameComponent })
}
}