Repository navigation
test(macos): 设置页声明顺序与构建分组保持一致（修复 #1581 的 macOS CI） - #1
Merged
FxRayHughes merged 1 commit intoNov 1, 2026
Merged
Conversation
运行环境、环境来源两页插在项目页和运行配置之间，使 SettingsCategory 声明顺序（搜索结果顺序）与侧栏构建分组顺序不一致， settingsCategoryPlacesProjectAndRunBetweenKeymapAndTerminal 在 CI 失败。 把两页的 case 移到项目页之前，测试改为断言 Keymap 与 Terminal 之间 恰好是构建分组，且分组以项目页、运行配置结尾。
FxRayHughes
marked this pull request as ready for review
November 1, 2026 09:20
FxRayHughes
merged commit Nov 1, 2026
6278663
into
feat/plugin-toolchain-sources
16 of 17 checks passed
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.
关联
合并目标是 1lck/Lithe-IDEA#1581 的分支
feat/plugin-toolchain-sources。合并后 1lck#1581 会自动包含这次改动。这个 PR 做什么
修复 1lck#1581 在 head
06337dc6上 macOS CI 唯一的失败（Swift tests）：原因：1lck#1581 把
toolchainEnvironment、toolchainSources两个 case 插在SettingsCategory的project和run之间，而侧栏SettingsGroup.build的顺序是「运行环境 → 环境来源 → 项目 → 运行配置」。SettingsCategory.allCases的声明顺序就是设置搜索结果的顺序（SettingsView.filteredCategories），所以搜索时这几页的顺序会和侧栏不一样，旧测试也因此失败。改动
macos/Sources/Lithe/Models/AppModel/AppModelSupportTypes.swiftproject之前，声明顺序和侧栏构建分组一致。只调整顺序，rawValue 和图标都不变macos/Tests/LitheTests/ProjectRuntimeSettingsTests.swiftsettingsCategoryPlacesBuildPagesBetweenKeymapAndTerminal，断言 Keymap 和 Terminal 之间正好是SettingsGroup.build.categories，并且最后两项是项目页、运行配置（保留原测试「运行配置紧跟它继承的项目环境」的意图）验证（本地）
test-stability-macos.sh -- --build-system native --filter 'ProjectRuntimeSettingsTests|SettingsSidebar|SettingsSearchVocabulary|MacToolchainDiscoveryTests|ToolchainSettings|MacLoginShellEnvironmentTests'：74 个测试、8 个 suite 全部通过，用时 3.6 秒，没有单个测试超过 1 秒。脚本附带的 test stability、i18n--check、runtime bundle immutability 检查也都通过。cargo test -p lithe-core --lib toolchain：71 个通过，0 个失败。其中包括评审机器人两个 P2 的回归测试（符号链接安装从解码到解析的完整链路、环境候选按声明的path布局选择）。