Skip to content

Minimal fix for #810 #823

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minimal fix for #810 #823

Show file tree
Hide file tree
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
13 changes: 6 additions & 7 deletions buildSrc/src/main/kotlin/BuildThemes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
),
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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" -> {
Expand All @@ -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.")
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/io/unthrottled/doki/util/Debouncer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down