hl-valdemar/vamp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

feat: add configurable three-pane conflict views

Browse Source
This commit is contained in:
Valdemar Lorenzen
2026-10-16 16:19:54 +02:00
parent a6310594c5
commit de6a57e67d
11 changed files with 176 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/session.rs
+17
View File
@@ -523,6 +523,7 @@ impl EditorSession {
editor.set_tab_spaces(config.tab_spaces, config.language_tab_spaces);
editor.set_diff_context_options(config.diff_context_lines, config.diff_expand_lines);
editor.set_diff_display_options(config.diff_view_mode, config.diff_split_orientation);
editor.resolve_history_layout = config.resolve_history_layout;
if let Err(error) =
editor.set_chrome_config(config.top_bar, config.bottom_bar, config.labels)
{
@@ -4358,6 +4359,22 @@ end
("config.leader = 7", "leader key must be a String"),
("config.leader = nil", "leader key must be a String"),
(r#"config.leader = """#, "leader key must not be empty"),
(
r#"config.resolve_history_layout = "invalid""#,
"resolve history layout must be columns or base_below",
),
(
"config.resolve_history_layout = 7",
"resolve history layout must be a String",
),
(
"config.resolve_history_layout = nil",
"resolve history layout must be a String",
),
(
r#"config.resolve_history_layout = """#,
"resolve history layout must not be empty",
),
(
r#"config.diff_view_mode = "invalid""#,
"diff view mode must be split or unified",