From 9be851ebc0170b2deae1085b301760b04557cee3 Mon Sep 17 00:00:00 2001
From: kaqqao <veggen@gmail.com>
Date: Tue, 9 Sep 2025 11:41:16 +0200
Subject: [PATCH] Minimal fix for #810

Fixes #810
---
 buildSrc/src/main/kotlin/BuildThemes.kt             | 13 ++++++-------
 .../kotlin/io/unthrottled/doki/util/Debouncer.kt    |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildThemes.kt b/buildSrc/src/main/kotlin/BuildThemes.kt
index 5c8e34853..9c779bb85 100644
--- a/buildSrc/src/main/kotlin/BuildThemes.kt
+++ b/buildSrc/src/main/kotlin/BuildThemes.kt
@@ -451,13 +451,13 @@ open class BuildThemes : DefaultTask() {
   }
 
   private fun buildStickerPath(separator: String?, masterThemeDefinition: MasterThemeDefinition) =
-    "${separator}stickers${separator}${masterThemeDefinition.usableGroup.toLowerCase()}${separator}${masterThemeDefinition.usableName}${separator}"
+    "${separator}stickers${separator}${masterThemeDefinition.usableGroup.lowercase()}${separator}${masterThemeDefinition.usableName}${separator}"
 
   private fun getResourceDirectory(masterThemeDefinition: MasterThemeDefinition): Path = get(
     getResourcesDirectory().toString(),
     "doki",
     "themes",
-    masterThemeDefinition.usableGroup.toLowerCase()
+    masterThemeDefinition.usableGroup.lowercase()
   )
 
   private fun getResourcesDirectory(): Path = get(
@@ -499,7 +499,7 @@ open class BuildThemes : DefaultTask() {
     val resolveAttributes =
       BuildFunctions.resolveTemplateWithCombini(
         AssetTemplateDefinition(
-          ui = jetbrainsAppDefinition.ui ?: emptyMap(),
+          ui = jetbrainsAppDefinition.ui,
           name = "jetbrains UI",
           extends = jetbrainsAppDefinition.uiBase ?: initialParentTemplateName,
         ),
@@ -544,7 +544,7 @@ open class BuildThemes : DefaultTask() {
       }
     }
     .collect(Collectors.toMap({ it.first }, { it.second }, { _, b -> b },
-      { TreeMap(Comparator.comparing { item -> item.toLowerCase() }) })
+      { TreeMap(Comparator.comparing { item -> item.lowercase() }) })
     )
 
   private fun createEditorScheme(
@@ -726,7 +726,6 @@ open class BuildThemes : DefaultTask() {
     val themeTemplate = editorTemplate.clone() as Node
     themeTemplate.breadthFirst()
       .filterIsInstance<Node>()
-      .map { it as Node }
       .forEach {
         when (it.name()) {
           "scheme" -> {
@@ -737,8 +736,8 @@ open class BuildThemes : DefaultTask() {
             val value = it.attribute("value") as? String
             if (value?.contains('$') == true) {
               val (end, replacementColor) = getReplacementColor(value, '$') { templateColor ->
-                dokiDefinitionMaster.overrides?.editorScheme?.colors?.get(templateColor) as? String
-                  ?: dokiDefinitionJetbrains.overrides?.editorScheme?.colors?.get(templateColor) as? String
+                dokiDefinitionMaster.overrides?.editorScheme?.colors?.get(templateColor)
+                  ?: dokiDefinitionJetbrains.overrides?.editorScheme?.colors?.get(templateColor)
                   ?: resolvedNamedColors[templateColor] as? String
                   ?: throw IllegalArgumentException("$templateColor is not in ${dokiDefinitionMaster.name}'s color definition.")
               }
diff --git a/src/main/kotlin/io/unthrottled/doki/util/Debouncer.kt b/src/main/kotlin/io/unthrottled/doki/util/Debouncer.kt
index 74fd5b4e5..a65fe3036 100644
--- a/src/main/kotlin/io/unthrottled/doki/util/Debouncer.kt
+++ b/src/main/kotlin/io/unthrottled/doki/util/Debouncer.kt
@@ -21,7 +21,7 @@ class AlarmDebouncer<T>(
   Debouncer,
     BufferedDebouncer<T>,
     Disposable {
-  private val alarm: Alarm = Alarm()
+  private val alarm: Alarm by lazy { Alarm() }
 
   override fun debounce(toDebounce: () -> Unit) {
     performDebounce({