From 8484c07596a5663b4c2864c41e285de183df4d1f Mon Sep 17 00:00:00 2001 From: Sakyvo Date: Fri, 20 Nov 2026 19:21:17 +0800 Subject: [PATCH] feat(settings): add an administrator_shield switch to hide the elevation badge An elevated Windows session marks every local tab with a shield before the program icon, and the badge could not be turned off. Add a `administrator_shield` preference (default on, current behaviour unchanged) and surface it as "Show administrator shield" in Appearance -> Interface, right after the tab close button. The badge decision now lives in one pure function, `shows_administrator_badge(enabled, elevated, inherits_host_token)`, so the switch, the elevation query and the per-pane host-token inheritance are all checked in one place; sidebar rows and top tabs reuse that computation through `TabPresentation.local_administrator`. Turning the switch off hides the marker only: the session keeps its rights. Move the `nebula_settings` unit tests into `src/tests.rs` so `lib.rs` stays under the 2000-line budget; no test body changed. --- CHANGELOG.md | 8 + nebula_app/i18n/en-US.json | 4 +- nebula_app/i18n/zh-CN.json | 4 +- nebula_app/src/gpui_shell/config.rs | 8 + nebula_app/src/gpui_shell/settings_pane.rs | 1 + .../settings_pane/appearance_advanced.rs | 7 + .../gpui_shell/settings_pane/setting_help.rs | 4 + .../gpui_shell/workspace/tab_presentation.rs | 13 +- nebula_settings/src/config_defaults.rs | 1 + nebula_settings/src/lib.rs | 590 +----------------- nebula_settings/src/reset.rs | 16 + nebula_settings/src/tests.rs | 584 +++++++++++++++++ 12 files changed, 650 insertions(+), 590 deletions(-) create mode 100644 nebula_settings/src/tests.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f7caea5..8e22bff40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ Every release entry is provided in English and Simplified Chinese. macOS, Linux, and Android downloads are Preview builds. +#### Added + +- Added a "Show administrator shield" switch under Appearance so an elevated Windows session can hide the badge in front of the tab name. The switch changes the marker only; the session keeps its rights. + #### Fixed - Fixed a delegated prompt remaining in the terminal editor when the agent changed keyboard mode before Enter was sent. @@ -35,6 +39,10 @@ macOS, Linux, and Android downloads are Preview builds. macOS、Linux 和 Android 下载为预览版。 +#### 新增 + +- 外观设置新增“显示管理员盾牌”开关,Windows 提权会话可隐藏标签名前的盾牌标记;开关只影响标记,会话权限不变。 + #### 修复 - 修复 Agent 在接收委派内容后切换键盘模式,导致回车未提交、指令留在输入框的问题。 diff --git a/nebula_app/i18n/en-US.json b/nebula_app/i18n/en-US.json index 7dcd9b602..897ad92f5 100644 --- a/nebula_app/i18n/en-US.json +++ b/nebula_app/i18n/en-US.json @@ -358,6 +358,7 @@ "cursor_shape": "Cursor shape", "blink_cursor": "Blink cursor", "show_tab_close_buttons": "Show tab close buttons", + "show_administrator_shield": "Show administrator shield", "interface_density": "Interface density", "terminal_content_opacity": "Terminal content opacity", "background_blur": "Background blur", @@ -678,7 +679,8 @@ "continues_the_previous_conversation_when": "Continues the previous conversation when restoring an AI tab.", "shows_ai_session_status_in": "Shows AI session status in the notification area.", "tab_titles_stay_on_the_directory": "Tabs show the current folder or SSH host.", - "tab_titles_host_and_task": "SSH tabs use the saved host name or address. Hover over a tab to see the current AI task." + "tab_titles_host_and_task": "SSH tabs use the saved host name or address. Hover over a tab to see the current AI task.", + "marks_elevated_windows_sessions": "Marks an elevated Windows session. Turning it off hides the shield only; the session keeps its rights." }, "pane": { "keep_tab_titles": "Keep directory and host names in tab titles", diff --git a/nebula_app/i18n/zh-CN.json b/nebula_app/i18n/zh-CN.json index 47707fa0f..770fe35a2 100644 --- a/nebula_app/i18n/zh-CN.json +++ b/nebula_app/i18n/zh-CN.json @@ -358,6 +358,7 @@ "cursor_shape": "光标形状", "blink_cursor": "光标闪烁", "show_tab_close_buttons": "显示标签关闭按钮", + "show_administrator_shield": "显示管理员盾牌", "interface_density": "界面外观", "terminal_content_opacity": "终端正文不透明度", "background_blur": "背景模糊", @@ -678,7 +679,8 @@ "continues_the_previous_conversation_when": "恢复 AI 标签时,继续上次的对话。", "shows_ai_session_status_in": "在通知区域查看 AI 会话状态。", "tab_titles_stay_on_the_directory": "标签显示当前目录或 SSH 主机。", - "tab_titles_host_and_task": "SSH 标签显示保存的主机名或地址。悬停标签可查看当前 AI 任务。" + "tab_titles_host_and_task": "SSH 标签显示保存的主机名或地址。悬停标签可查看当前 AI 任务。", + "marks_elevated_windows_sessions": "标记 Windows 提权会话。关闭只隐藏盾牌,会话权限不变。" }, "pane": { "keep_tab_titles": "标签标题保留目录名或主机名", diff --git a/nebula_app/src/gpui_shell/config.rs b/nebula_app/src/gpui_shell/config.rs index efe344c5b..605f1f2eb 100644 --- a/nebula_app/src/gpui_shell/config.rs +++ b/nebula_app/src/gpui_shell/config.rs @@ -81,6 +81,8 @@ pub struct Settings { pub tab_close_visible: bool, /// Use the working directory or SSH destination as the automatic tab title. pub static_tab_titles: bool, + /// 标签前的管理员盾牌:默认显示,关闭只影响标记不影响会话权限。 + pub administrator_shield: bool, pub tab_reveal: nebula_settings::TabRevealName, pub tab_sleep: nebula_settings::TabSleep, /// 命令补全设置(settings.txt 的 `ghost`/`completion_style`), @@ -136,6 +138,11 @@ pub(crate) fn static_tab_titles(cx: &App) -> bool { cx.try_global::().is_some_and(|settings| settings.static_tab_titles) } +/// 管理员盾牌开关:未注册全局设置时保持上游的"显示"行为。 +pub(crate) fn administrator_shield(cx: &App) -> bool { + cx.try_global::().is_none_or(|settings| settings.administrator_shield) +} + #[inline] fn resolve_ui_language(preference: nebula_settings::LanguagePref) -> UiLanguage { LanguagePreference::from(preference).resolved() @@ -304,6 +311,7 @@ impl Settings { notification_duration: runtime.notification_duration, tab_close_visible: runtime.tab_close_visible, static_tab_titles: runtime.static_tab_titles, + administrator_shield: runtime.administrator_shield, tab_reveal: runtime.tab_reveal, tab_sleep: runtime.tab_sleep, ghost: runtime.ghost, diff --git a/nebula_app/src/gpui_shell/settings_pane.rs b/nebula_app/src/gpui_shell/settings_pane.rs index 3be2c7911..ab6c51e7f 100644 --- a/nebula_app/src/gpui_shell/settings_pane.rs +++ b/nebula_app/src/gpui_shell/settings_pane.rs @@ -783,6 +783,7 @@ impl SettingsPane { "multiline_paste_confirm" => flag!(multiline_paste_confirm), "tab_close_visible" => flag!(tab_close_visible), "static_tab_titles" => flag!(static_tab_titles), + "administrator_shield" => flag!(administrator_shield), "terminal_proxy" => flag!(terminal_proxy), "refresh_environment" => flag!(refresh_environment), "powerline" => flag!(powerline), diff --git a/nebula_app/src/gpui_shell/settings_pane/appearance_advanced.rs b/nebula_app/src/gpui_shell/settings_pane/appearance_advanced.rs index d28bb170f..bfeffd59f 100644 --- a/nebula_app/src/gpui_shell/settings_pane/appearance_advanced.rs +++ b/nebula_app/src/gpui_shell/settings_pane/appearance_advanced.rs @@ -102,6 +102,13 @@ impl SettingsPane { self.runtime.tab_close_visible, cx, )) + .child(self.switch_row( + "administrator_shield", + language.text(crate::i18n::Message::SettingsAppearanceShowAdministratorShield), + help("administrator_shield", language), + self.runtime.administrator_shield, + cx, + )) .child(self.select_row( "language", language.text(crate::i18n::Message::CommonLanguage), diff --git a/nebula_app/src/gpui_shell/settings_pane/setting_help.rs b/nebula_app/src/gpui_shell/settings_pane/setting_help.rs index 5d5d6f67b..a63549a4f 100644 --- a/nebula_app/src/gpui_shell/settings_pane/setting_help.rs +++ b/nebula_app/src/gpui_shell/settings_pane/setting_help.rs @@ -133,6 +133,9 @@ pub(super) fn help(key: &str, language: UiLanguage) -> SettingHelp { language.text(crate::i18n::Message::SettingsHelpTabTitlesStayOnTheDirectory), Some(language.text(crate::i18n::Message::SettingsHelpTabTitlesHostAndTask)), ), + "administrator_shield" => { + (language.text(crate::i18n::Message::SettingsHelpMarksElevatedWindowsSessions), None) + } "keep_session" => ( language.text(crate::i18n::Message::SettingsHelpKeepsTerminalsRunningAfterClosing), Some(language.text(crate::i18n::Message::SettingsHelpWhenDisabledClosingTheWindow)), @@ -193,6 +196,7 @@ mod tests { "windowing_behavior", "vcs_display", "static_tab_titles", + "administrator_shield", "keep_session", "restore_session", "resume_ai", diff --git a/nebula_app/src/gpui_shell/workspace/tab_presentation.rs b/nebula_app/src/gpui_shell/workspace/tab_presentation.rs index 45666fc2b..96e934c2d 100644 --- a/nebula_app/src/gpui_shell/workspace/tab_presentation.rs +++ b/nebula_app/src/gpui_shell/workspace/tab_presentation.rs @@ -137,6 +137,12 @@ impl gpui::RenderOnce for TabIconSlot { } } +/// 提权标记要同时成立三件事:用户没关掉开关、本进程已提权、该 pane 继承同一 +/// 主机令牌。测试进程无法真实提权,所以三项都从参数注入才能验到关掉开关这一路。 +fn shows_administrator_badge(enabled: bool, elevated: bool, inherits_host_token: bool) -> bool { + enabled && elevated && inherits_host_token +} + impl NebulaWorkspace { /// 完整标签文本。**不在这里截断**:可见宽度是布局问题,字符数上限会在 /// 窄侧栏下漏出、在宽侧栏下白扔字符。截断由 `render_sidebar` 按实测 @@ -173,8 +179,11 @@ impl NebulaWorkspace { let title = self.tab_title(ix, cx); let tab = &self.tabs[ix]; let view = tab.focused_view().map(|entity| entity.read(cx)); - let local_administrator = crate::platform::elevation::is_elevated().unwrap_or(false) - && view.is_some_and(TerminalView::inherits_windows_host_token); + let local_administrator = shows_administrator_badge( + crate::gpui_shell::config::administrator_shield(cx), + crate::platform::elevation::is_elevated().unwrap_or(false), + view.is_some_and(TerminalView::inherits_windows_host_token), + ); let pane_count = match tab { WorkspaceTab::Terminal { panes, .. } => panes.len(), _ => 0, diff --git a/nebula_settings/src/config_defaults.rs b/nebula_settings/src/config_defaults.rs index 4b97e096d..644cc8c5f 100644 --- a/nebula_settings/src/config_defaults.rs +++ b/nebula_settings/src/config_defaults.rs @@ -41,6 +41,7 @@ pub fn ui_value_kind(key: &str) -> Option { | "multiline_paste_confirm" | "tab_close_visible" | "static_tab_titles" + | "administrator_shield" | "powerline" | "ghost" | "prompt_suggestions_enabled" diff --git a/nebula_settings/src/lib.rs b/nebula_settings/src/lib.rs index 7551e67ba..e31a83266 100644 --- a/nebula_settings/src/lib.rs +++ b/nebula_settings/src/lib.rs @@ -1046,6 +1046,8 @@ pub struct RuntimeSettings { pub tab_close_visible: bool, /// Keep the automatic tab title on the local directory or SSH destination. pub static_tab_titles: bool, + /// 标签前的 Windows 管理员盾牌:关 = 不提权标记,会话权限不变。 + pub administrator_shield: bool, /// 新建本地终端是否把 Windows 系统代理写入代理环境变量。自定义代理地址 /// 不看这个开关:网络页填了地址就会写入新终端。默认关。已打开的会话不改。 pub terminal_proxy: bool, @@ -1250,6 +1252,7 @@ impl RuntimeSettings { multiline_paste_confirm: raw.bool_on("multiline_paste_confirm").unwrap_or(true), tab_close_visible: raw.bool_on("tab_close_visible").unwrap_or(true), static_tab_titles: raw.bool_on("static_tab_titles").unwrap_or(false), + administrator_shield: raw.bool_on("administrator_shield").unwrap_or(true), terminal_proxy: raw.bool_on("terminal_proxy").unwrap_or(false), refresh_environment: raw.bool_on("refresh_environment").unwrap_or(true), powerline: raw.bool_on("powerline").unwrap_or(true), @@ -1410,589 +1413,4 @@ pub fn format_hex_rgb(rgb: Rgb8) -> String { } #[cfg(test)] -mod tests { - #[test] - fn environment_refresh_defaults_and_round_trips() { - for text in ["", "refresh_environment=\n", "refresh_environment=invalid\n"] { - assert!(RuntimeSettings::from_raw(&RawSettings::from_text(text)).refresh_environment); - } - let original = "theme=Nord\nrefresh_environment=1\ncustom=keep\n"; - let disabled = apply_updates(original, &[("refresh_environment", "0".into())]); - assert!(!RuntimeSettings::from_raw(&RawSettings::from_text(&disabled)).refresh_environment); - assert!(disabled.contains("custom=keep")); - let enabled = apply_updates(&disabled, &[("refresh_environment", "1".into())]); - assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&enabled)).refresh_environment); - assert_eq!(enabled, original); - } - - #[test] - fn pane_preferences_round_trip_and_allow_a_missing_mouse_override() { - let defaults = RuntimeSettings::from_raw(&RawSettings::default()); - assert_eq!(defaults.focus_follows_mouse, None); - assert!(defaults.dim_inactive_panes); - let mut text = "theme=Nord\nfuture_option=keep\n".to_owned(); - for (focus, dim) in [(true, false), (false, true)] { - text = apply_updates( - &text, - &[ - ("focus_follows_mouse", (focus as u8).to_string()), - ("dim_inactive_panes", (dim as u8).to_string()), - ], - ); - let settings = RuntimeSettings::from_raw(&RawSettings::from_text(&text)); - assert_eq!(settings.focus_follows_mouse, Some(focus)); - assert_eq!(settings.dim_inactive_panes, dim); - assert_eq!(settings.theme, ThemeName::Nord); - assert!(text.contains("future_option=keep")); - } - text = apply_updates(&text, &[("focus_follows_mouse", String::new())]); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text(&text)).focus_follows_mouse, - None - ); - } - - #[test] - fn empty_quick_terminal_hotkey_is_distinct_from_an_unset_preference() { - let unset = RuntimeSettings::from_raw(&RawSettings::from_text("theme=Nord\n")); - let cleared = - RuntimeSettings::from_raw(&RawSettings::from_text("quick_terminal_hotkey=\n")); - assert_eq!(unset.quick_terminal_hotkey, DEFAULT_QUICK_TERMINAL_HOTKEY); - assert_eq!(cleared.quick_terminal_hotkey, ""); - } - use super::*; - - #[test] - fn app_icon_defaults_and_unknown_values_use_titanium() { - for text in ["", "app_icon=\n", "app_icon=unknown\n", "app_icon=../custom.ico\n"] { - let settings = RuntimeSettings::from_raw(&RawSettings::from_text(text)); - assert_eq!(settings.app_icon, AppIconName::Titanium); - } - } - - #[test] - fn all_app_icons_round_trip_without_changing_other_settings() { - for variant in AppIconName::ALL { - let text = apply_updates( - "# keep\ntheme=Nord\ncustom=preserved\napp_icon=silver-violet\n", - &[("app_icon", variant.settings_value().to_owned())], - ); - let settings = RuntimeSettings::from_raw(&RawSettings::from_text(&text)); - assert_eq!(settings.app_icon, variant); - assert_eq!(settings.theme, ThemeName::Nord); - assert!(text.contains("custom=preserved")); - assert!(text.contains("# keep")); - assert_eq!(text.matches("app_icon=").count(), 1); - } - assert_eq!(AppIconName::from_settings(" TITANIUM "), Some(AppIconName::Titanium)); - assert_eq!(AppIconName::from_settings("night-mint"), Some(AppIconName::NightMint)); - let numbers: std::collections::HashSet<_> = - AppIconName::ALL.into_iter().map(|variant| variant.palette().number).collect(); - assert_eq!(numbers.len(), 25); - } - - #[test] - fn nord_and_paper_carry_the_flush_card_geometry() { - // Nord 是卡几何抽象的第一个实验者:半径与卡缝双双归零、靠一条竖线分界。 - // 这四个数一起构成「终端铺满整个右侧区域」的形态,任一项退回默认都会 - // 让它变回浮起的圆角卡——所以逐项钉死,而不是只断言 radius。 - for theme in ThemeName::BUILTIN { - let geometry = theme.card_geometry(); - assert_eq!(geometry.radius, 0.0); - assert_eq!(geometry.gutter, 0.0); - assert_eq!(geometry.divider, 1.0); - assert!(!geometry.shadow); - } - - // Retired identifiers also resolve to the flat geometry contract. - for theme in [ThemeName::Nebula, ThemeName::CoalDark] { - let geometry = theme.card_geometry(); - assert_eq!(geometry.radius, 0.0); - assert_eq!(geometry.gutter, 0.0); - assert_eq!(geometry.divider, 1.0); - } - } - - #[test] - fn card_geometry_keys_stay_none_until_the_user_sets_them() { - // `None` 的含义是「用户没设过」,主题默认因此能生效。若在解析处就 - // unwrap 成具体数字,切主题便再也换不了形态——那是这套抽象的失效模式。 - let untouched = RuntimeSettings::from_raw(&RawSettings::from_text("theme=Nord\n")); - assert_eq!(untouched.pane_card_radius, None); - assert_eq!(untouched.pane_card_gutter, None); - assert_eq!(untouched.pane_card_shadow, None); - assert_eq!(untouched.pane_card_divider, None); - - // 显式值覆盖主题默认,且越界值按范围钳制而不是被丢弃。 - let tuned = RuntimeSettings::from_raw(&RawSettings::from_text( - "pane_card_radius=999\n\ - pane_card_gutter=12\n\ - pane_card_shadow=on\n\ - pane_card_divider=99\n", - )); - assert_eq!(tuned.pane_card_radius, Some(MAX_PANE_CARD_RADIUS)); - assert_eq!(tuned.pane_card_gutter, Some(12.0)); - assert_eq!(tuned.pane_card_shadow, Some(true)); - assert_eq!(tuned.pane_card_divider, Some(MAX_PANE_CARD_DIVIDER)); - } - - #[test] - fn parses_real_settings_shape() { - let raw = RawSettings::from_text( - "language=zh-CN\n\ - theme=SilverLight\n\ - follow_system_theme=0\n\ - ghost=1\n\ - accept=tab\n\ - completion_style=popup\n\ - shell=pwsh\n\ - font_family=Maple Mono Normal NF CN\n\ - ui_font_family=Arial\n\ - ui_font_size=18\n\ - font_family_cjk=PingFang SC\n\ - font_size=16.3\n\ - cursor_shape=beam\n\ - cursor_blink=1\n\ - copy_on_select=1\n\ - multiline_paste_confirm=0\n\ - tab_close_visible=0\n\ - static_tab_titles=1\n\ - bell=audible\n\ - cjk_bold_regular=1\n\ - tabs_position=top\n\ - tab_reveal=instant\n\ - density=compact\n\ - new_tab_position=end\n\ - windowing_behavior=use_existing\n\ - cell_width_mode=relaxed\n\ - fetch=1\n\ - powerline=0\n\ - keep_session=1\n\ - silent_start=1\n\ - restore_session=0\n\ - resume_ai=0\n\ - tray=0\n\ - blur=0\n\ - opacity=0.87\n\ - background=#101216\n\ - theme_foreground=#d6dae6\n\ - custom_theme=my-night\n\ - panel_resize=1\n\ - sidebar_w=222\n\ - ssh_proxy_mode=custom\n\ - ssh_proxy_url=socks5://127.0.0.1:7890\n\ - quick_terminal_hotkey=alt+`\n\ - startup_directory=\n", - ); - let settings = RuntimeSettings::from_raw(&raw); - assert_eq!(settings.language, LanguagePref::ZhCn); - assert_eq!(settings.theme, ThemeName::SilverLight); - assert_eq!(settings.font_family.as_deref(), Some("Maple Mono Normal NF CN")); - assert_eq!(settings.font_family_cjk.as_deref(), Some("PingFang SC")); - assert_eq!(settings.ui_font_family.as_deref(), Some("Arial")); - assert_eq!(settings.ui_font_size_px, Some(18.0)); - // font_size 键存的是逻辑像素(旧壳写盘语义),不做 pt 换算。 - assert_eq!(settings.font_size_px, Some(16.3)); - assert_eq!(settings.cursor_shape, Some(CursorShapeName::Beam)); - assert_eq!(settings.cursor_blink, Some(true)); - assert!(settings.copy_on_select); - assert!(!settings.multiline_paste_confirm); - assert!(!settings.tab_close_visible); - assert!(settings.static_tab_titles, "static_tab_titles=1 固定标签标题为目录名"); - assert_eq!(settings.bell, BellModeName::Audible); - assert!(!settings.powerline); - assert_eq!(settings.shell.as_deref(), Some("pwsh")); - assert_eq!(settings.accept, AcceptKeyName::Tab); - assert_eq!(settings.completion_style, CompletionStyleName::Popup); - assert_eq!(settings.tabs_position, TabsPositionName::Top); - assert_eq!(settings.tab_reveal, TabRevealName::Instant); - assert_eq!(settings.density, DensityName::Compact); - assert_eq!(settings.new_tab_position, NewTabPositionName::End); - assert_eq!(settings.windowing_behavior, WindowingBehaviorName::UseExisting); - assert_eq!(settings.cell_width_mode, CellWidthModeName::Relaxed); - assert!(settings.fetch); - assert!(settings.keep_session); - assert!(settings.silent_start); - assert!(!settings.restore_session); - assert!(!settings.resume_ai); - assert!(!settings.tray); - assert_eq!(settings.blur, BlurModeName::None); - assert!((settings.opacity - 0.87).abs() < 1e-6); - assert_eq!(settings.background, Some([0x10, 0x12, 0x16])); - assert_eq!(settings.theme_foreground, Some([0xd6, 0xda, 0xe6])); - assert_eq!(settings.custom_theme.as_deref(), Some("my-night")); - assert!(settings.panel_resize); - assert_eq!(settings.sidebar_width, 222.0); - assert_eq!(settings.ssh_proxy_mode, ProxyModeName::Custom); - assert_eq!(settings.ssh_proxy_url, "socks5://127.0.0.1:7890"); - assert_eq!(settings.quick_terminal_hotkey, "alt+`"); - // 空值 = 未设置。 - assert_eq!(raw.value("startup_directory"), None); - } - - #[test] - fn defaults_when_file_content_is_absent_or_junk() { - let settings = RuntimeSettings::from_raw(&RawSettings::from_text("theme=NoSuchTheme\n")); - // 出厂默认逐项对照旧壳 nebula_settings_load。 - assert_eq!(settings.language, LanguagePref::System); - assert_eq!(settings.theme, ThemeName::Nord); - assert_eq!(settings.font_family, None); - assert_eq!(settings.font_family_cjk, None); - assert_eq!(settings.ui_font_family, None); - assert_eq!(settings.ui_font_size_px, None); - assert!(!settings.copy_on_select); - assert!(settings.multiline_paste_confirm, "多行粘贴确认默认开(上游兼容)"); - assert!(settings.tab_close_visible, "标签关闭按钮默认可见(上游兼容)"); - assert!(!settings.static_tab_titles, "标签标题默认跟随 AI 任务标题(上游行为)"); - assert!(!settings.terminal_proxy, "终端网络代理上游默认关(兼容)"); - assert!(settings.powerline); - assert!(settings.ghost); - assert_eq!(settings.accept, AcceptKeyName::Both); - assert_eq!(settings.completion_style, CompletionStyleName::Inline); - assert!(settings.cjk_bold_regular); - assert_eq!(settings.tabs_position, TabsPositionName::Sidebar); - assert_eq!(settings.tab_reveal, TabRevealName::Slide); - assert_eq!(settings.density, DensityName::Standard); - assert_eq!(settings.new_tab_position, NewTabPositionName::AfterCurrent); - assert_eq!(settings.windowing_behavior, WindowingBehaviorName::UseAnyExisting); - assert_eq!(settings.cell_width_mode, CellWidthModeName::Compact); - assert!(!settings.fetch); - assert!(settings.auto_check_updates); - assert!(!settings.keep_session); - assert!(!settings.silent_start); - assert!(settings.restore_session); - assert!(settings.resume_ai); - assert!(settings.tray); - assert_eq!(settings.blur, BlurModeName::None); - assert_eq!(settings.opacity, 1.0); - assert_eq!(settings.background, None); - assert_eq!(settings.theme_foreground, None); - assert_eq!(settings.custom_theme, None); - assert!(settings.panel_resize); - assert!( - !RuntimeSettings::from_raw(&RawSettings::from_text("panel_resize=0\n")).panel_resize - ); - assert_eq!(settings.sidebar_width, DEFAULT_SIDEBAR_WIDTH); - assert_eq!(settings.ssh_proxy_mode, ProxyModeName::Off); - assert_eq!(settings.quick_terminal_hotkey, DEFAULT_QUICK_TERMINAL_HOTKEY); - assert_eq!(settings.bell, BellModeName::Both); - } - - #[test] - fn automatic_update_checks_can_be_disabled_without_changing_the_default() { - assert!(RuntimeSettings::from_raw(&RawSettings::default()).auto_check_updates); - assert!( - RuntimeSettings::from_raw(&RawSettings::from_text("auto_check_updates=1\n")) - .auto_check_updates - ); - assert!( - !RuntimeSettings::from_raw(&RawSettings::from_text("auto_check_updates=0\n")) - .auto_check_updates - ); - } - - #[test] - fn ai_toasts_default_on_and_accept_all_boolean_spellings() { - for value in ["", "invalid", "1", "true", "YES", "On"] { - let raw = RawSettings::from_text(&format!("ai_toasts={value}\n")); - assert!(RuntimeSettings::from_raw(&raw).ai_toasts, "{value:?}"); - } - assert!(RuntimeSettings::from_raw(&RawSettings::default()).ai_toasts); - for value in ["0", "false", "NO", "Off"] { - let raw = RawSettings::from_text(&format!("ai_toasts={value}\n")); - let settings = RuntimeSettings::from_raw(&raw); - assert!(!settings.ai_toasts, "{value:?}"); - assert_eq!(settings.bell, BellModeName::Both); - assert!(settings.auto_check_updates); - assert!(settings.resume_ai); - } - } - - #[test] - fn ai_toast_toggle_round_trips_without_replacing_other_settings() { - let original = "# preferences\nshell=zsh\ncustom_key=keep\nAI_TOASTS=1\n"; - let disabled = apply_updates(original, &[("ai_toasts", "0".to_owned())]); - let restored = RuntimeSettings::from_raw(&RawSettings::from_text(&disabled)); - assert!(!restored.ai_toasts); - assert_eq!(restored.shell.as_deref(), Some("zsh")); - assert!(disabled.contains("# preferences\n")); - assert!(disabled.contains("custom_key=keep\n")); - let enabled = apply_updates(&disabled, &[("ai_toasts", "1".to_owned())]); - assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&enabled)).ai_toasts); - assert_eq!(enabled.matches("ai_toasts=").count(), 1); - } - - #[test] - fn ctrl_wheel_font_zoom_defaults_on_and_accepts_all_boolean_spellings() { - assert!(RuntimeSettings::from_raw(&RawSettings::default()).ctrl_wheel_font_zoom); - for value in ["", "invalid", "1", "true", "YES", "On"] { - let raw = RawSettings::from_text(&format!("ctrl_wheel_font_zoom={value}\n")); - assert!(RuntimeSettings::from_raw(&raw).ctrl_wheel_font_zoom, "{value:?}"); - } - for value in ["0", "false", "NO", "Off"] { - let raw = RawSettings::from_text(&format!("ctrl_wheel_font_zoom={value}\n")); - let settings = RuntimeSettings::from_raw(&raw); - assert!(!settings.ctrl_wheel_font_zoom, "{value:?}"); - assert_eq!(settings.bell, BellModeName::Both); - assert!(settings.font_size_px.is_none()); - } - } - - #[test] - fn bell_mode_parses_known_values_and_rejects_junk() { - assert_eq!(BellModeName::from_settings("none"), Some(BellModeName::None)); - assert_eq!(BellModeName::from_settings("off"), Some(BellModeName::None)); - assert_eq!(BellModeName::from_settings("visual"), Some(BellModeName::Visual)); - assert_eq!(BellModeName::from_settings("audible"), Some(BellModeName::Audible)); - assert_eq!(BellModeName::from_settings("both"), Some(BellModeName::Both)); - assert_eq!(BellModeName::from_settings("loud"), None); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("bell=loud\n")).bell, - BellModeName::Both - ); - } - - #[test] - fn blur_mode_parses_mica_alt_and_migrates_legacy_bool() { - assert_eq!(BlurModeName::from_settings("none"), Some(BlurModeName::None)); - assert_eq!(BlurModeName::from_settings("off"), Some(BlurModeName::None)); - assert_eq!(BlurModeName::from_settings("mica"), Some(BlurModeName::Mica)); - assert_eq!(BlurModeName::from_settings("mica-alt"), Some(BlurModeName::MicaAlt)); - assert_eq!(BlurModeName::from_settings("aero"), Some(BlurModeName::Aero)); - // 未公开 API 的名字(`ACCENT_ENABLE_BLURBEHIND`)也认,手改配置的人 - // 可能照着实现名写。 - assert_eq!(BlurModeName::from_settings("blurbehind"), Some(BlurModeName::Aero)); - assert_eq!(BlurModeName::from_settings("acrylic"), Some(BlurModeName::Acrylic)); - assert_eq!(BlurModeName::from_settings("frosted"), None); - // 大小写与空白由 from_settings 归一(设置文件是手改的)。 - assert_eq!(BlurModeName::from_settings(" Acrylic "), Some(BlurModeName::Acrylic)); - assert_eq!(BlurModeName::from_settings(" AERO "), Some(BlurModeName::Aero)); - - // 旧壳布尔值迁移:关保持关,开落到 Mica(不是最贵的 Acrylic)。 - assert_eq!(BlurModeName::from_settings("0"), Some(BlurModeName::None)); - assert_eq!(BlurModeName::from_settings("false"), Some(BlurModeName::None)); - assert_eq!(BlurModeName::from_settings("1"), Some(BlurModeName::Mica)); - assert_eq!(BlurModeName::from_settings("true"), Some(BlurModeName::Mica)); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("blur=1\nopacity=1.00\n")).opacity, - 1.0 - ); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("blur=mica\nopacity=1.00\n")).opacity, - 1.0 - ); - - // 认不出的值回落到默认关闭,不主动启用系统材质。 - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("blur=frosted\n")).blur, - BlurModeName::None - ); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("blur=acrylic\n")).blur, - BlurModeName::Acrylic - ); - - // settings_value 与 from_settings 必须互为逆运算,否则设置页存盘后 - // 重开会掉档。 - for mode in [ - BlurModeName::None, - BlurModeName::Mica, - BlurModeName::MicaAlt, - BlurModeName::Aero, - BlurModeName::Acrylic, - ] { - assert_eq!(BlurModeName::from_settings(mode.settings_value()), Some(mode)); - } - - assert!(!BlurModeName::None.enabled()); - assert!(BlurModeName::Mica.enabled()); - assert!(BlurModeName::MicaAlt.enabled()); - assert!(BlurModeName::Aero.enabled()); - assert!(BlurModeName::Acrylic.enabled()); - } - - #[test] - fn opacity_defaults_to_opaque_and_preserves_explicit_values_for_every_material() { - for blur in ["none", "mica", "mica-alt", "aero", "acrylic", "1", "true"] { - let raw = format!("blur={blur}\n"); - let runtime = RuntimeSettings::from_raw(&RawSettings::from_text(&raw)); - assert_eq!(runtime.opacity, 1.0, "{blur}"); - assert_eq!(Some(runtime.blur), BlurModeName::from_settings(blur)); - for opacity in [0.0, 0.65, 1.0] { - let raw = format!("blur={blur}\nopacity={opacity}\n"); - let runtime = RuntimeSettings::from_raw(&RawSettings::from_text(&raw)); - assert_eq!(runtime.opacity, opacity, "{raw}"); - } - } - let invalid = - RuntimeSettings::from_raw(&RawSettings::from_text("blur=unknown\nopacity=invalid\n")); - assert_eq!(invalid.blur, BlurModeName::None); - assert_eq!(invalid.opacity, 1.0); - } - - #[test] - fn tabs_position_parses_supported_values_and_defaults_to_sidebar() { - assert_eq!(TabsPositionName::from_settings("sidebar"), Some(TabsPositionName::Sidebar)); - assert_eq!(TabsPositionName::from_settings("TOP"), Some(TabsPositionName::Top)); - assert_eq!(TabsPositionName::from_settings("bottom"), None); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::from_text("tabs_position=bottom\n")) - .tabs_position, - TabsPositionName::Sidebar - ); - } - - #[test] - fn windowing_behavior_preserves_existing_default_and_accepts_terminal_aliases() { - assert_eq!( - WindowingBehaviorName::from_settings("use_new"), - Some(WindowingBehaviorName::UseNew) - ); - assert_eq!( - WindowingBehaviorName::from_settings("useAnyExisting"), - Some(WindowingBehaviorName::UseAnyExisting) - ); - assert_eq!( - WindowingBehaviorName::from_settings("useExisting"), - Some(WindowingBehaviorName::UseExisting) - ); - assert_eq!(WindowingBehaviorName::from_settings("reuse_everything"), None); - assert_eq!( - RuntimeSettings::from_raw(&RawSettings::default()).windowing_behavior, - WindowingBehaviorName::UseAnyExisting - ); - } - - #[test] - fn hex_rgb_roundtrip() { - assert_eq!(parse_hex_rgb("#8bd5ca"), Some([0x8b, 0xd5, 0xca])); - assert_eq!(parse_hex_rgb("8bd5ca"), Some([0x8b, 0xd5, 0xca])); - assert_eq!(parse_hex_rgb("#nothex"), None); - assert_eq!(format_hex_rgb([0x8b, 0xd5, 0xca]), "#8bd5ca"); - } - - #[test] - fn shorthand_rgb_expands_and_rejects_non_hex_or_alpha_input() { - for value in ["#123", "123", " #123 "] { - assert_eq!(parse_hex_rgb(value), Some([0x11, 0x22, 0x33]), "{value:?}"); - } - assert_eq!(parse_hex_rgb("#aBc"), Some([0xaa, 0xbb, 0xcc])); - assert_eq!(format_hex_rgb(parse_hex_rgb("#aBc").unwrap()), "#aabbcc"); - for value in ["", "#", "#12", "#1234", "#12345", "#12345678", "#12g", "+1b2c3", "中文"] { - assert_eq!(parse_hex_rgb(value), None, "{value:?}"); - } - } - - #[test] - fn theme_names_roundtrip() { - assert_eq!(ThemeName::Nebula.prompt_name(), "Nebula"); - assert_eq!(ThemeName::from_prompt_name("Nebula"), Some(ThemeName::Nebula)); - for theme in [ - ThemeName::Nebula, - ThemeName::SilverLight, - ThemeName::SteelDark, - ThemeName::LimestoneLight, - ThemeName::CoalDark, - ThemeName::LinenLight, - ThemeName::MossDark, - ThemeName::Nord, - ThemeName::Paper, - ] { - assert_eq!(ThemeName::from_prompt_name(theme.prompt_name()), Some(theme)); - } - } - - #[test] - fn light_themes_replace_foreground_dark_themes_do_not() { - assert!(ThemeName::SilverLight.term_theme().is_light); - assert!(ThemeName::LimestoneLight.term_theme().is_light); - assert!(ThemeName::LinenLight.term_theme().is_light); - assert!(ThemeName::Paper.term_theme().is_light); - assert!(!ThemeName::Nebula.term_theme().is_light); - assert!(!ThemeName::SteelDark.term_theme().is_light); - assert!(!ThemeName::Nord.term_theme().is_light); - // 浅色主题终端底全白,背景由主题裁定而非用户配色。 - assert_eq!(ThemeName::SilverLight.term_theme().background, [255, 255, 255]); - assert_eq!(ThemeName::Nebula.term_theme().background, [15, 17, 26]); - } - - #[test] - fn nord_and_warm_sand_keep_their_declared_terminal_palettes() { - let nord = ThemeName::Nord.term_theme().exact.expect("Nord exact colors"); - assert_eq!(nord.foreground, [0xf1, 0xf6, 0xff]); - assert_eq!(nord.ansi[0], [0x3b, 0x42, 0x52]); - assert_eq!(nord.ansi[15], [0xec, 0xef, 0xf4]); - assert_eq!(nord.cursor, Some([0xe5, 0xe9, 0xf0])); - assert_eq!(nord.cursor_stroke, Some([0x88, 0xc0, 0xd0])); - assert_eq!(nord.selection_background, Some([0xe5, 0xe9, 0xf0])); - - let paper = ThemeName::Paper.term_theme().exact.expect("Warm Sand exact colors"); - assert_eq!(paper.foreground, [0x2f, 0x2e, 0x2b]); - assert_eq!(paper.ansi[0], [0x2f, 0x2e, 0x2b]); - assert_eq!(paper.ansi[15], [0x4a, 0x43, 0x3b]); - assert_eq!(paper.cursor, None); - assert_eq!(paper.selection_background, None); - } - - #[test] - fn existing_themes_keep_their_original_terminal_color_contract() { - for theme in [ - ThemeName::Nebula, - ThemeName::SilverLight, - ThemeName::SteelDark, - ThemeName::LimestoneLight, - ThemeName::CoalDark, - ThemeName::LinenLight, - ThemeName::MossDark, - ] { - assert_eq!(theme.term_theme().exact, None, "{}", theme.prompt_name()); - } - } - - #[test] - fn keys_are_case_insensitive_and_trimmed() { - let raw = RawSettings::from_text(" Theme = SilverLight \nFONT_SIZE=12\n"); - assert_eq!(raw.value("theme"), Some("SilverLight")); - assert_eq!(raw.f32("font_size"), Some(12.0)); - } - - #[test] - fn apply_updates_replaces_in_place_and_appends_missing() { - let text = "language=system\ntheme=Nebula\nshell=powershell\n"; - let updated = - apply_updates(text, &[("theme", "SilverLight".into()), ("cursor_blink", "1".into())]); - assert_eq!( - updated, - "language=system\ntheme=SilverLight\nshell=powershell\ncursor_blink=1\n" - ); - } - - #[test] - fn keybind_pairs_parse_and_rewrite() { - let text = "theme=Nebula\nkeybind=ctrl+x:Copy\n# comment\nkeybind=alt+f1:SplitRight\n"; - assert_eq!( - keybind_pairs_from_text(text), - vec![ - ("ctrl+x".to_owned(), "Copy".to_owned()), - ("alt+f1".to_owned(), "SplitRight".to_owned()), - ] - ); - let rewritten = apply_keybinds(text, &[("ctrl+y".to_owned(), "Paste".to_owned())]); - assert_eq!(rewritten, "theme=Nebula\n# comment\nkeybind=ctrl+y:Paste\n"); - } - - #[test] - fn apply_updates_preserves_unknown_lines_and_matches_case_insensitively() { - let text = "# comment survives\nTHEME=CoalDark\nkeybind=ctrl+x=Copy\n"; - let updated = apply_updates(text, &[("theme", "MossDark".into())]); - // 键名按调用方写法输出,注释与奇形行原样保留。 - assert_eq!(updated, "# comment survives\ntheme=MossDark\nkeybind=ctrl+x=Copy\n"); - } - - #[test] - fn apply_updates_on_empty_file_appends_all() { - let updated = - apply_updates("", &[("theme", "Nebula".into()), ("font_size", "12.5".into())]); - assert_eq!(updated, "theme=Nebula\nfont_size=12.5\n"); - } -} +mod tests; diff --git a/nebula_settings/src/reset.rs b/nebula_settings/src/reset.rs index ffbff0ca7..3c4e932b2 100644 --- a/nebula_settings/src/reset.rs +++ b/nebula_settings/src/reset.rs @@ -29,6 +29,7 @@ const RESET_KEYS: &[&str] = &[ "multiline_paste_confirm", "tab_close_visible", "static_tab_titles", + "administrator_shield", "terminal_proxy", "refresh_environment", "powerline", @@ -221,6 +222,21 @@ mod tests { assert!(!RuntimeSettings::from_raw(&RawSettings::from_text(&restored)).static_tab_titles); } + #[test] + fn administrator_shield_defaults_to_shown_and_round_trips() { + for text in ["", "administrator_shield=\n", "administrator_shield=invalid\n"] { + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(text)).administrator_shield); + } + let original = "custom=keep\n"; + let hidden = crate::apply_updates(original, &[("administrator_shield", "0".into())]); + assert!(!RuntimeSettings::from_raw(&RawSettings::from_text(&hidden)).administrator_shield); + let shown = crate::apply_updates(&hidden, &[("administrator_shield", "1".into())]); + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&shown)).administrator_shield); + let restored = default_settings_text(&hidden); + assert_eq!(restored, original); + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&restored)).administrator_shield); + } + #[test] fn reset_restores_split_dimming_and_removes_mouse_override() { let restored = diff --git a/nebula_settings/src/tests.rs b/nebula_settings/src/tests.rs new file mode 100644 index 000000000..199dee591 --- /dev/null +++ b/nebula_settings/src/tests.rs @@ -0,0 +1,584 @@ + #[test] + fn environment_refresh_defaults_and_round_trips() { + for text in ["", "refresh_environment=\n", "refresh_environment=invalid\n"] { + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(text)).refresh_environment); + } + let original = "theme=Nord\nrefresh_environment=1\ncustom=keep\n"; + let disabled = apply_updates(original, &[("refresh_environment", "0".into())]); + assert!(!RuntimeSettings::from_raw(&RawSettings::from_text(&disabled)).refresh_environment); + assert!(disabled.contains("custom=keep")); + let enabled = apply_updates(&disabled, &[("refresh_environment", "1".into())]); + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&enabled)).refresh_environment); + assert_eq!(enabled, original); + } + + #[test] + fn pane_preferences_round_trip_and_allow_a_missing_mouse_override() { + let defaults = RuntimeSettings::from_raw(&RawSettings::default()); + assert_eq!(defaults.focus_follows_mouse, None); + assert!(defaults.dim_inactive_panes); + let mut text = "theme=Nord\nfuture_option=keep\n".to_owned(); + for (focus, dim) in [(true, false), (false, true)] { + text = apply_updates( + &text, + &[ + ("focus_follows_mouse", (focus as u8).to_string()), + ("dim_inactive_panes", (dim as u8).to_string()), + ], + ); + let settings = RuntimeSettings::from_raw(&RawSettings::from_text(&text)); + assert_eq!(settings.focus_follows_mouse, Some(focus)); + assert_eq!(settings.dim_inactive_panes, dim); + assert_eq!(settings.theme, ThemeName::Nord); + assert!(text.contains("future_option=keep")); + } + text = apply_updates(&text, &[("focus_follows_mouse", String::new())]); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text(&text)).focus_follows_mouse, + None + ); + } + + #[test] + fn empty_quick_terminal_hotkey_is_distinct_from_an_unset_preference() { + let unset = RuntimeSettings::from_raw(&RawSettings::from_text("theme=Nord\n")); + let cleared = + RuntimeSettings::from_raw(&RawSettings::from_text("quick_terminal_hotkey=\n")); + assert_eq!(unset.quick_terminal_hotkey, DEFAULT_QUICK_TERMINAL_HOTKEY); + assert_eq!(cleared.quick_terminal_hotkey, ""); + } + use super::*; + + #[test] + fn app_icon_defaults_and_unknown_values_use_titanium() { + for text in ["", "app_icon=\n", "app_icon=unknown\n", "app_icon=../custom.ico\n"] { + let settings = RuntimeSettings::from_raw(&RawSettings::from_text(text)); + assert_eq!(settings.app_icon, AppIconName::Titanium); + } + } + + #[test] + fn all_app_icons_round_trip_without_changing_other_settings() { + for variant in AppIconName::ALL { + let text = apply_updates( + "# keep\ntheme=Nord\ncustom=preserved\napp_icon=silver-violet\n", + &[("app_icon", variant.settings_value().to_owned())], + ); + let settings = RuntimeSettings::from_raw(&RawSettings::from_text(&text)); + assert_eq!(settings.app_icon, variant); + assert_eq!(settings.theme, ThemeName::Nord); + assert!(text.contains("custom=preserved")); + assert!(text.contains("# keep")); + assert_eq!(text.matches("app_icon=").count(), 1); + } + assert_eq!(AppIconName::from_settings(" TITANIUM "), Some(AppIconName::Titanium)); + assert_eq!(AppIconName::from_settings("night-mint"), Some(AppIconName::NightMint)); + let numbers: std::collections::HashSet<_> = + AppIconName::ALL.into_iter().map(|variant| variant.palette().number).collect(); + assert_eq!(numbers.len(), 25); + } + + #[test] + fn nord_and_paper_carry_the_flush_card_geometry() { + // Nord 是卡几何抽象的第一个实验者:半径与卡缝双双归零、靠一条竖线分界。 + // 这四个数一起构成「终端铺满整个右侧区域」的形态,任一项退回默认都会 + // 让它变回浮起的圆角卡——所以逐项钉死,而不是只断言 radius。 + for theme in ThemeName::BUILTIN { + let geometry = theme.card_geometry(); + assert_eq!(geometry.radius, 0.0); + assert_eq!(geometry.gutter, 0.0); + assert_eq!(geometry.divider, 1.0); + assert!(!geometry.shadow); + } + + // Retired identifiers also resolve to the flat geometry contract. + for theme in [ThemeName::Nebula, ThemeName::CoalDark] { + let geometry = theme.card_geometry(); + assert_eq!(geometry.radius, 0.0); + assert_eq!(geometry.gutter, 0.0); + assert_eq!(geometry.divider, 1.0); + } + } + + #[test] + fn card_geometry_keys_stay_none_until_the_user_sets_them() { + // `None` 的含义是「用户没设过」,主题默认因此能生效。若在解析处就 + // unwrap 成具体数字,切主题便再也换不了形态——那是这套抽象的失效模式。 + let untouched = RuntimeSettings::from_raw(&RawSettings::from_text("theme=Nord\n")); + assert_eq!(untouched.pane_card_radius, None); + assert_eq!(untouched.pane_card_gutter, None); + assert_eq!(untouched.pane_card_shadow, None); + assert_eq!(untouched.pane_card_divider, None); + + // 显式值覆盖主题默认,且越界值按范围钳制而不是被丢弃。 + let tuned = RuntimeSettings::from_raw(&RawSettings::from_text( + "pane_card_radius=999\n\ + pane_card_gutter=12\n\ + pane_card_shadow=on\n\ + pane_card_divider=99\n", + )); + assert_eq!(tuned.pane_card_radius, Some(MAX_PANE_CARD_RADIUS)); + assert_eq!(tuned.pane_card_gutter, Some(12.0)); + assert_eq!(tuned.pane_card_shadow, Some(true)); + assert_eq!(tuned.pane_card_divider, Some(MAX_PANE_CARD_DIVIDER)); + } + + #[test] + fn parses_real_settings_shape() { + let raw = RawSettings::from_text( + "language=zh-CN\n\ + theme=SilverLight\n\ + follow_system_theme=0\n\ + ghost=1\n\ + accept=tab\n\ + completion_style=popup\n\ + shell=pwsh\n\ + font_family=Maple Mono Normal NF CN\n\ + ui_font_family=Arial\n\ + ui_font_size=18\n\ + font_family_cjk=PingFang SC\n\ + font_size=16.3\n\ + cursor_shape=beam\n\ + cursor_blink=1\n\ + copy_on_select=1\n\ + multiline_paste_confirm=0\n\ + tab_close_visible=0\n\ + static_tab_titles=1\n\ + bell=audible\n\ + cjk_bold_regular=1\n\ + tabs_position=top\n\ + tab_reveal=instant\n\ + density=compact\n\ + new_tab_position=end\n\ + windowing_behavior=use_existing\n\ + cell_width_mode=relaxed\n\ + fetch=1\n\ + powerline=0\n\ + keep_session=1\n\ + silent_start=1\n\ + restore_session=0\n\ + resume_ai=0\n\ + tray=0\n\ + blur=0\n\ + opacity=0.87\n\ + background=#101216\n\ + theme_foreground=#d6dae6\n\ + custom_theme=my-night\n\ + panel_resize=1\n\ + sidebar_w=222\n\ + ssh_proxy_mode=custom\n\ + ssh_proxy_url=socks5://127.0.0.1:7890\n\ + quick_terminal_hotkey=alt+`\n\ + startup_directory=\n", + ); + let settings = RuntimeSettings::from_raw(&raw); + assert_eq!(settings.language, LanguagePref::ZhCn); + assert_eq!(settings.theme, ThemeName::SilverLight); + assert_eq!(settings.font_family.as_deref(), Some("Maple Mono Normal NF CN")); + assert_eq!(settings.font_family_cjk.as_deref(), Some("PingFang SC")); + assert_eq!(settings.ui_font_family.as_deref(), Some("Arial")); + assert_eq!(settings.ui_font_size_px, Some(18.0)); + // font_size 键存的是逻辑像素(旧壳写盘语义),不做 pt 换算。 + assert_eq!(settings.font_size_px, Some(16.3)); + assert_eq!(settings.cursor_shape, Some(CursorShapeName::Beam)); + assert_eq!(settings.cursor_blink, Some(true)); + assert!(settings.copy_on_select); + assert!(!settings.multiline_paste_confirm); + assert!(!settings.tab_close_visible); + assert!(settings.static_tab_titles, "static_tab_titles=1 固定标签标题为目录名"); + assert_eq!(settings.bell, BellModeName::Audible); + assert!(!settings.powerline); + assert_eq!(settings.shell.as_deref(), Some("pwsh")); + assert_eq!(settings.accept, AcceptKeyName::Tab); + assert_eq!(settings.completion_style, CompletionStyleName::Popup); + assert_eq!(settings.tabs_position, TabsPositionName::Top); + assert_eq!(settings.tab_reveal, TabRevealName::Instant); + assert_eq!(settings.density, DensityName::Compact); + assert_eq!(settings.new_tab_position, NewTabPositionName::End); + assert_eq!(settings.windowing_behavior, WindowingBehaviorName::UseExisting); + assert_eq!(settings.cell_width_mode, CellWidthModeName::Relaxed); + assert!(settings.fetch); + assert!(settings.keep_session); + assert!(settings.silent_start); + assert!(!settings.restore_session); + assert!(!settings.resume_ai); + assert!(!settings.tray); + assert_eq!(settings.blur, BlurModeName::None); + assert!((settings.opacity - 0.87).abs() < 1e-6); + assert_eq!(settings.background, Some([0x10, 0x12, 0x16])); + assert_eq!(settings.theme_foreground, Some([0xd6, 0xda, 0xe6])); + assert_eq!(settings.custom_theme.as_deref(), Some("my-night")); + assert!(settings.panel_resize); + assert_eq!(settings.sidebar_width, 222.0); + assert_eq!(settings.ssh_proxy_mode, ProxyModeName::Custom); + assert_eq!(settings.ssh_proxy_url, "socks5://127.0.0.1:7890"); + assert_eq!(settings.quick_terminal_hotkey, "alt+`"); + // 空值 = 未设置。 + assert_eq!(raw.value("startup_directory"), None); + } + + #[test] + fn defaults_when_file_content_is_absent_or_junk() { + let settings = RuntimeSettings::from_raw(&RawSettings::from_text("theme=NoSuchTheme\n")); + // 出厂默认逐项对照旧壳 nebula_settings_load。 + assert_eq!(settings.language, LanguagePref::System); + assert_eq!(settings.theme, ThemeName::Nord); + assert_eq!(settings.font_family, None); + assert_eq!(settings.font_family_cjk, None); + assert_eq!(settings.ui_font_family, None); + assert_eq!(settings.ui_font_size_px, None); + assert!(!settings.copy_on_select); + assert!(settings.multiline_paste_confirm, "多行粘贴确认默认开(上游兼容)"); + assert!(settings.tab_close_visible, "标签关闭按钮默认可见(上游兼容)"); + assert!(!settings.static_tab_titles, "标签标题默认跟随 AI 任务标题(上游行为)"); + assert!(!settings.terminal_proxy, "终端网络代理上游默认关(兼容)"); + assert!(settings.powerline); + assert!(settings.ghost); + assert_eq!(settings.accept, AcceptKeyName::Both); + assert_eq!(settings.completion_style, CompletionStyleName::Inline); + assert!(settings.cjk_bold_regular); + assert_eq!(settings.tabs_position, TabsPositionName::Sidebar); + assert_eq!(settings.tab_reveal, TabRevealName::Slide); + assert_eq!(settings.density, DensityName::Standard); + assert_eq!(settings.new_tab_position, NewTabPositionName::AfterCurrent); + assert_eq!(settings.windowing_behavior, WindowingBehaviorName::UseAnyExisting); + assert_eq!(settings.cell_width_mode, CellWidthModeName::Compact); + assert!(!settings.fetch); + assert!(settings.auto_check_updates); + assert!(!settings.keep_session); + assert!(!settings.silent_start); + assert!(settings.restore_session); + assert!(settings.resume_ai); + assert!(settings.tray); + assert_eq!(settings.blur, BlurModeName::None); + assert_eq!(settings.opacity, 1.0); + assert_eq!(settings.background, None); + assert_eq!(settings.theme_foreground, None); + assert_eq!(settings.custom_theme, None); + assert!(settings.panel_resize); + assert!( + !RuntimeSettings::from_raw(&RawSettings::from_text("panel_resize=0\n")).panel_resize + ); + assert_eq!(settings.sidebar_width, DEFAULT_SIDEBAR_WIDTH); + assert_eq!(settings.ssh_proxy_mode, ProxyModeName::Off); + assert_eq!(settings.quick_terminal_hotkey, DEFAULT_QUICK_TERMINAL_HOTKEY); + assert_eq!(settings.bell, BellModeName::Both); + } + + #[test] + fn automatic_update_checks_can_be_disabled_without_changing_the_default() { + assert!(RuntimeSettings::from_raw(&RawSettings::default()).auto_check_updates); + assert!( + RuntimeSettings::from_raw(&RawSettings::from_text("auto_check_updates=1\n")) + .auto_check_updates + ); + assert!( + !RuntimeSettings::from_raw(&RawSettings::from_text("auto_check_updates=0\n")) + .auto_check_updates + ); + } + + #[test] + fn ai_toasts_default_on_and_accept_all_boolean_spellings() { + for value in ["", "invalid", "1", "true", "YES", "On"] { + let raw = RawSettings::from_text(&format!("ai_toasts={value}\n")); + assert!(RuntimeSettings::from_raw(&raw).ai_toasts, "{value:?}"); + } + assert!(RuntimeSettings::from_raw(&RawSettings::default()).ai_toasts); + for value in ["0", "false", "NO", "Off"] { + let raw = RawSettings::from_text(&format!("ai_toasts={value}\n")); + let settings = RuntimeSettings::from_raw(&raw); + assert!(!settings.ai_toasts, "{value:?}"); + assert_eq!(settings.bell, BellModeName::Both); + assert!(settings.auto_check_updates); + assert!(settings.resume_ai); + } + } + + #[test] + fn ai_toast_toggle_round_trips_without_replacing_other_settings() { + let original = "# preferences\nshell=zsh\ncustom_key=keep\nAI_TOASTS=1\n"; + let disabled = apply_updates(original, &[("ai_toasts", "0".to_owned())]); + let restored = RuntimeSettings::from_raw(&RawSettings::from_text(&disabled)); + assert!(!restored.ai_toasts); + assert_eq!(restored.shell.as_deref(), Some("zsh")); + assert!(disabled.contains("# preferences\n")); + assert!(disabled.contains("custom_key=keep\n")); + let enabled = apply_updates(&disabled, &[("ai_toasts", "1".to_owned())]); + assert!(RuntimeSettings::from_raw(&RawSettings::from_text(&enabled)).ai_toasts); + assert_eq!(enabled.matches("ai_toasts=").count(), 1); + } + + #[test] + fn ctrl_wheel_font_zoom_defaults_on_and_accepts_all_boolean_spellings() { + assert!(RuntimeSettings::from_raw(&RawSettings::default()).ctrl_wheel_font_zoom); + for value in ["", "invalid", "1", "true", "YES", "On"] { + let raw = RawSettings::from_text(&format!("ctrl_wheel_font_zoom={value}\n")); + assert!(RuntimeSettings::from_raw(&raw).ctrl_wheel_font_zoom, "{value:?}"); + } + for value in ["0", "false", "NO", "Off"] { + let raw = RawSettings::from_text(&format!("ctrl_wheel_font_zoom={value}\n")); + let settings = RuntimeSettings::from_raw(&raw); + assert!(!settings.ctrl_wheel_font_zoom, "{value:?}"); + assert_eq!(settings.bell, BellModeName::Both); + assert!(settings.font_size_px.is_none()); + } + } + + #[test] + fn bell_mode_parses_known_values_and_rejects_junk() { + assert_eq!(BellModeName::from_settings("none"), Some(BellModeName::None)); + assert_eq!(BellModeName::from_settings("off"), Some(BellModeName::None)); + assert_eq!(BellModeName::from_settings("visual"), Some(BellModeName::Visual)); + assert_eq!(BellModeName::from_settings("audible"), Some(BellModeName::Audible)); + assert_eq!(BellModeName::from_settings("both"), Some(BellModeName::Both)); + assert_eq!(BellModeName::from_settings("loud"), None); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("bell=loud\n")).bell, + BellModeName::Both + ); + } + + #[test] + fn blur_mode_parses_mica_alt_and_migrates_legacy_bool() { + assert_eq!(BlurModeName::from_settings("none"), Some(BlurModeName::None)); + assert_eq!(BlurModeName::from_settings("off"), Some(BlurModeName::None)); + assert_eq!(BlurModeName::from_settings("mica"), Some(BlurModeName::Mica)); + assert_eq!(BlurModeName::from_settings("mica-alt"), Some(BlurModeName::MicaAlt)); + assert_eq!(BlurModeName::from_settings("aero"), Some(BlurModeName::Aero)); + // 未公开 API 的名字(`ACCENT_ENABLE_BLURBEHIND`)也认,手改配置的人 + // 可能照着实现名写。 + assert_eq!(BlurModeName::from_settings("blurbehind"), Some(BlurModeName::Aero)); + assert_eq!(BlurModeName::from_settings("acrylic"), Some(BlurModeName::Acrylic)); + assert_eq!(BlurModeName::from_settings("frosted"), None); + // 大小写与空白由 from_settings 归一(设置文件是手改的)。 + assert_eq!(BlurModeName::from_settings(" Acrylic "), Some(BlurModeName::Acrylic)); + assert_eq!(BlurModeName::from_settings(" AERO "), Some(BlurModeName::Aero)); + + // 旧壳布尔值迁移:关保持关,开落到 Mica(不是最贵的 Acrylic)。 + assert_eq!(BlurModeName::from_settings("0"), Some(BlurModeName::None)); + assert_eq!(BlurModeName::from_settings("false"), Some(BlurModeName::None)); + assert_eq!(BlurModeName::from_settings("1"), Some(BlurModeName::Mica)); + assert_eq!(BlurModeName::from_settings("true"), Some(BlurModeName::Mica)); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("blur=1\nopacity=1.00\n")).opacity, + 1.0 + ); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("blur=mica\nopacity=1.00\n")).opacity, + 1.0 + ); + + // 认不出的值回落到默认关闭,不主动启用系统材质。 + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("blur=frosted\n")).blur, + BlurModeName::None + ); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("blur=acrylic\n")).blur, + BlurModeName::Acrylic + ); + + // settings_value 与 from_settings 必须互为逆运算,否则设置页存盘后 + // 重开会掉档。 + for mode in [ + BlurModeName::None, + BlurModeName::Mica, + BlurModeName::MicaAlt, + BlurModeName::Aero, + BlurModeName::Acrylic, + ] { + assert_eq!(BlurModeName::from_settings(mode.settings_value()), Some(mode)); + } + + assert!(!BlurModeName::None.enabled()); + assert!(BlurModeName::Mica.enabled()); + assert!(BlurModeName::MicaAlt.enabled()); + assert!(BlurModeName::Aero.enabled()); + assert!(BlurModeName::Acrylic.enabled()); + } + + #[test] + fn opacity_defaults_to_opaque_and_preserves_explicit_values_for_every_material() { + for blur in ["none", "mica", "mica-alt", "aero", "acrylic", "1", "true"] { + let raw = format!("blur={blur}\n"); + let runtime = RuntimeSettings::from_raw(&RawSettings::from_text(&raw)); + assert_eq!(runtime.opacity, 1.0, "{blur}"); + assert_eq!(Some(runtime.blur), BlurModeName::from_settings(blur)); + for opacity in [0.0, 0.65, 1.0] { + let raw = format!("blur={blur}\nopacity={opacity}\n"); + let runtime = RuntimeSettings::from_raw(&RawSettings::from_text(&raw)); + assert_eq!(runtime.opacity, opacity, "{raw}"); + } + } + let invalid = + RuntimeSettings::from_raw(&RawSettings::from_text("blur=unknown\nopacity=invalid\n")); + assert_eq!(invalid.blur, BlurModeName::None); + assert_eq!(invalid.opacity, 1.0); + } + + #[test] + fn tabs_position_parses_supported_values_and_defaults_to_sidebar() { + assert_eq!(TabsPositionName::from_settings("sidebar"), Some(TabsPositionName::Sidebar)); + assert_eq!(TabsPositionName::from_settings("TOP"), Some(TabsPositionName::Top)); + assert_eq!(TabsPositionName::from_settings("bottom"), None); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::from_text("tabs_position=bottom\n")) + .tabs_position, + TabsPositionName::Sidebar + ); + } + + #[test] + fn windowing_behavior_preserves_existing_default_and_accepts_terminal_aliases() { + assert_eq!( + WindowingBehaviorName::from_settings("use_new"), + Some(WindowingBehaviorName::UseNew) + ); + assert_eq!( + WindowingBehaviorName::from_settings("useAnyExisting"), + Some(WindowingBehaviorName::UseAnyExisting) + ); + assert_eq!( + WindowingBehaviorName::from_settings("useExisting"), + Some(WindowingBehaviorName::UseExisting) + ); + assert_eq!(WindowingBehaviorName::from_settings("reuse_everything"), None); + assert_eq!( + RuntimeSettings::from_raw(&RawSettings::default()).windowing_behavior, + WindowingBehaviorName::UseAnyExisting + ); + } + + #[test] + fn hex_rgb_roundtrip() { + assert_eq!(parse_hex_rgb("#8bd5ca"), Some([0x8b, 0xd5, 0xca])); + assert_eq!(parse_hex_rgb("8bd5ca"), Some([0x8b, 0xd5, 0xca])); + assert_eq!(parse_hex_rgb("#nothex"), None); + assert_eq!(format_hex_rgb([0x8b, 0xd5, 0xca]), "#8bd5ca"); + } + + #[test] + fn shorthand_rgb_expands_and_rejects_non_hex_or_alpha_input() { + for value in ["#123", "123", " #123 "] { + assert_eq!(parse_hex_rgb(value), Some([0x11, 0x22, 0x33]), "{value:?}"); + } + assert_eq!(parse_hex_rgb("#aBc"), Some([0xaa, 0xbb, 0xcc])); + assert_eq!(format_hex_rgb(parse_hex_rgb("#aBc").unwrap()), "#aabbcc"); + for value in ["", "#", "#12", "#1234", "#12345", "#12345678", "#12g", "+1b2c3", "中文"] { + assert_eq!(parse_hex_rgb(value), None, "{value:?}"); + } + } + + #[test] + fn theme_names_roundtrip() { + assert_eq!(ThemeName::Nebula.prompt_name(), "Nebula"); + assert_eq!(ThemeName::from_prompt_name("Nebula"), Some(ThemeName::Nebula)); + for theme in [ + ThemeName::Nebula, + ThemeName::SilverLight, + ThemeName::SteelDark, + ThemeName::LimestoneLight, + ThemeName::CoalDark, + ThemeName::LinenLight, + ThemeName::MossDark, + ThemeName::Nord, + ThemeName::Paper, + ] { + assert_eq!(ThemeName::from_prompt_name(theme.prompt_name()), Some(theme)); + } + } + + #[test] + fn light_themes_replace_foreground_dark_themes_do_not() { + assert!(ThemeName::SilverLight.term_theme().is_light); + assert!(ThemeName::LimestoneLight.term_theme().is_light); + assert!(ThemeName::LinenLight.term_theme().is_light); + assert!(ThemeName::Paper.term_theme().is_light); + assert!(!ThemeName::Nebula.term_theme().is_light); + assert!(!ThemeName::SteelDark.term_theme().is_light); + assert!(!ThemeName::Nord.term_theme().is_light); + // 浅色主题终端底全白,背景由主题裁定而非用户配色。 + assert_eq!(ThemeName::SilverLight.term_theme().background, [255, 255, 255]); + assert_eq!(ThemeName::Nebula.term_theme().background, [15, 17, 26]); + } + + #[test] + fn nord_and_warm_sand_keep_their_declared_terminal_palettes() { + let nord = ThemeName::Nord.term_theme().exact.expect("Nord exact colors"); + assert_eq!(nord.foreground, [0xf1, 0xf6, 0xff]); + assert_eq!(nord.ansi[0], [0x3b, 0x42, 0x52]); + assert_eq!(nord.ansi[15], [0xec, 0xef, 0xf4]); + assert_eq!(nord.cursor, Some([0xe5, 0xe9, 0xf0])); + assert_eq!(nord.cursor_stroke, Some([0x88, 0xc0, 0xd0])); + assert_eq!(nord.selection_background, Some([0xe5, 0xe9, 0xf0])); + + let paper = ThemeName::Paper.term_theme().exact.expect("Warm Sand exact colors"); + assert_eq!(paper.foreground, [0x2f, 0x2e, 0x2b]); + assert_eq!(paper.ansi[0], [0x2f, 0x2e, 0x2b]); + assert_eq!(paper.ansi[15], [0x4a, 0x43, 0x3b]); + assert_eq!(paper.cursor, None); + assert_eq!(paper.selection_background, None); + } + + #[test] + fn existing_themes_keep_their_original_terminal_color_contract() { + for theme in [ + ThemeName::Nebula, + ThemeName::SilverLight, + ThemeName::SteelDark, + ThemeName::LimestoneLight, + ThemeName::CoalDark, + ThemeName::LinenLight, + ThemeName::MossDark, + ] { + assert_eq!(theme.term_theme().exact, None, "{}", theme.prompt_name()); + } + } + + #[test] + fn keys_are_case_insensitive_and_trimmed() { + let raw = RawSettings::from_text(" Theme = SilverLight \nFONT_SIZE=12\n"); + assert_eq!(raw.value("theme"), Some("SilverLight")); + assert_eq!(raw.f32("font_size"), Some(12.0)); + } + + #[test] + fn apply_updates_replaces_in_place_and_appends_missing() { + let text = "language=system\ntheme=Nebula\nshell=powershell\n"; + let updated = + apply_updates(text, &[("theme", "SilverLight".into()), ("cursor_blink", "1".into())]); + assert_eq!( + updated, + "language=system\ntheme=SilverLight\nshell=powershell\ncursor_blink=1\n" + ); + } + + #[test] + fn keybind_pairs_parse_and_rewrite() { + let text = "theme=Nebula\nkeybind=ctrl+x:Copy\n# comment\nkeybind=alt+f1:SplitRight\n"; + assert_eq!( + keybind_pairs_from_text(text), + vec![ + ("ctrl+x".to_owned(), "Copy".to_owned()), + ("alt+f1".to_owned(), "SplitRight".to_owned()), + ] + ); + let rewritten = apply_keybinds(text, &[("ctrl+y".to_owned(), "Paste".to_owned())]); + assert_eq!(rewritten, "theme=Nebula\n# comment\nkeybind=ctrl+y:Paste\n"); + } + + #[test] + fn apply_updates_preserves_unknown_lines_and_matches_case_insensitively() { + let text = "# comment survives\nTHEME=CoalDark\nkeybind=ctrl+x=Copy\n"; + let updated = apply_updates(text, &[("theme", "MossDark".into())]); + // 键名按调用方写法输出,注释与奇形行原样保留。 + assert_eq!(updated, "# comment survives\ntheme=MossDark\nkeybind=ctrl+x=Copy\n"); + } + + #[test] + fn apply_updates_on_empty_file_appends_all() { + let updated = + apply_updates("", &[("theme", "Nebula".into()), ("font_size", "12.5".into())]); + assert_eq!(updated, "theme=Nebula\nfont_size=12.5\n"); + }