Skip to content

Fix cloze number when existing clozes are present #20398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alok-Silswal wants to merge 4 commits into
base: main
Choose a base branch
from
+62 −0
Open

Fix cloze number when existing clozes are present #20398

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8414bc1
Fix cloze number when existing clozes are present
Alok-Silswal Mar 5, 2026
d7931f4
Added a unit test case for cloze numbering with existing clozes
Alok-Silswal Mar 5, 2026
d69a2f9
Added more unit test cases
Alok-Silswal Mar 6, 2026
5ac3273
Amended logic w.r.t. feedback and added more unit tests
Alok-Silswal Mar 6, 2026
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
47 changes: 35 additions & 12 deletions AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,28 @@ class InstantEditorViewModel :
}
}

/** Make cloze counter and intClozeList consistent with actual text. */
private fun syncClozeState(text: String?) {
if (text.isNullOrEmpty()) {
intClozeList.clear()
_currentClozeNumber.value = 1
return
}

intClozeList.clear()

var max = 0
clozePattern.findAll(text).forEach {
val value = it.groups[2]?.value?.toIntOrNull()
if (value != null) {
intClozeList.add(value)
if (value > max) max = value
}
}

_currentClozeNumber.value = max + 1
}

/**
* Retrieves all cloze text fields from the current editor note's note type.
*
Expand All @@ -206,6 +228,7 @@ class InstantEditorViewModel :

fun setClozeFieldText(text: String?) {
_actualClozeFieldText.value = text
syncClozeState(text) // Keep internal list of cloze indices(intClozeList) aligned with actual clozes in text
}

/**
Expand Down Expand Up @@ -233,10 +256,15 @@ class InstantEditorViewModel :

val clozeText: String?

val clozeNumber = currentClozeNumber
if (currentClozeMode.value == InstantNoteEditorActivity.ClozeMode.INCREMENT) {
incrementClozeNumber()
}
val clozeNumber =
if (currentClozeMode.value == InstantNoteEditorActivity.ClozeMode.INCREMENT) {
val number = currentClozeNumber
incrementClozeNumber()
number
} else {
intClozeList.maxOrNull() ?: 1
}

intClozeList.add(clozeNumber)

// Extract the first, second, and third regex groups from the matcher
Expand Down Expand Up @@ -379,18 +407,13 @@ class InstantEditorViewModel :
}

fun toggleClozeMode() {
val newMode =
_currentClozeMode.value =
when (_currentClozeMode.value) {
InstantNoteEditorActivity.ClozeMode.INCREMENT -> {
decrementClozeNumber()
InstantNoteEditorActivity.ClozeMode.INCREMENT ->
InstantNoteEditorActivity.ClozeMode.NO_INCREMENT
}
InstantNoteEditorActivity.ClozeMode.NO_INCREMENT -> {
incrementClozeNumber()
InstantNoteEditorActivity.ClozeMode.NO_INCREMENT ->
InstantNoteEditorActivity.ClozeMode.INCREMENT
}
}
_currentClozeMode.value = newMode
}
}

Expand Down
Loading