Repository navigation
Golden Gate: ключи для проверки из limits и choices, список сброса по строке / the watched keys from limits and choices, the reset list one a line - #154
Merged
Conversation
… one a line Every new Golden Gate setting touched two one-line lists in services/GoldenGate.qml: _watched (what triggers sanitize) and themeKeys (what «Reset the theme» puts back). So any two PRs adding a setting conflicted there (MixaDoDs#141, MixaDoDs#145, MixaDoDs#149, MixaDoDs#152, MixaDoDs#153 do, pairwise). - _watched is built from the keys of limits and choices: a key with a range or a list of choices is watched by being there (lightFrom and darkFrom, in limits but missing from the old list, are watched now too); - themeKeys, limits and choices hold one key a line, in order, so new settings land on lines of their own. No change in behaviour otherwise. qml-check: 719 files, 0 errors; the Golden Gate system tests pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…tting goes in Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Зачем
Каждая новая настройка Golden Gate правила две однострочные строки в
services/GoldenGate.qml:_watched(что запускаетsanitize) иthemeKeys(что возвращает «Сбросить тему»). Поэтому любые два PR с настройками конфликтуют именно там. У меня так попарно конфликтуют #141, #145, #149, #152 и #153.Что сделано
_watchedстроится из ключейlimitsиchoices. Ключ с диапазоном или списком вариантов проверяется уже потому, что он там есть.lightFromиdarkFromстояли вlimits, но в старом списке их не было, теперь проверяются и они.themeKeys,limitsиchoicesпо ключу на строку, по алфавиту. Новые настройки попадают в разные строки.Поведение больше нигде не меняется. Если этот PR влить первым, остальные PR с настройками Golden Gate я переложу поверх него, и их конфликты в этих строках уйдут.
Проверено
scripts/qml-check.sh: 719 файлов, 0 ошибок; системные тесты Golden Gate прошли. Во вложенном niri неверное значение настройки вsettings.jsonвозвращается к допустимому, как раньше.EN
Every new Golden Gate setting touched two one-line lists in
services/GoldenGate.qml:_watched(what triggerssanitize) andthemeKeys(what "Reset the theme" puts back), so any two PRs adding a setting conflict there (#141, #145, #149, #152 and #153 do, pairwise)._watchedis now built from the keys oflimitsandchoices(lightFromanddarkFrom, inlimitsbut missing from the old list, are watched now too);themeKeys,limitsandchoiceshold one key a line, in order. No change in behaviour otherwise. Merged first, it lets me rebase the other Golden Gate PRs onto it and their conflicts in these lines go away.qml-check: 719 files, 0 errors; the Golden Gate system tests pass; in a nested niri a bad value in
settings.jsongoes back into its choices as before.🤖 Generated with Claude Code