Skip to content

Fix generatePlaceholders clearing externally-added placeholders #259

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

Merged
0ft3n merged 1 commit into from
Apr 20, 2026
Merged

Fix generatePlaceholders clearing externally-added placeholders #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions core/common/src/main/kotlin/com/willfp/libreforge/triggers/DispatchedTrigger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,32 @@ class DispatchedTrigger(
val trigger: Trigger,
val data: TriggerData
) {
private val _placeholders = mutableListOf<NamedValue>()
private val _generatedPlaceholders = mutableListOf<NamedValue>()
private val _externalPlaceholders = mutableListOf<NamedValue>()
private var _cachedPlaceholders: List<InjectablePlaceholder>? = null

val rawPlaceholders: List<NamedValue>
get() = _placeholders
get() = _generatedPlaceholders + _externalPlaceholders

val placeholders: List<InjectablePlaceholder>
get() = _cachedPlaceholders ?: _placeholders.flatMap { it.placeholders }.also {
get() = _cachedPlaceholders ?: rawPlaceholders.flatMap { it.placeholders }.also {
_cachedPlaceholders = it
}


fun addPlaceholder(placeholder: NamedValue) {
_placeholders += placeholder
_externalPlaceholders += placeholder
_cachedPlaceholders = null
}

fun addPlaceholders(placeholder: Iterable<NamedValue>) {
_placeholders += placeholder
_externalPlaceholders += placeholder
_cachedPlaceholders = null
}

fun inheritPlaceholders(other: DispatchedTrigger): DispatchedTrigger {
_placeholders += other._placeholders
_generatedPlaceholders += other._generatedPlaceholders
_externalPlaceholders += other._externalPlaceholders
_cachedPlaceholders = null
return this
}
Expand All @@ -45,10 +47,10 @@ class DispatchedTrigger(
* and again after mutation with the updated [data].
*/
internal fun generatePlaceholders(data: TriggerData = this.data) {
_placeholders.clear()
_generatedPlaceholders.clear()
_cachedPlaceholders = null
for (placeholder in TriggerPlaceholders) {
_placeholders += placeholder.createPlaceholders(data)
_generatedPlaceholders += placeholder.createPlaceholders(data)
}
}

Expand Down