ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

merge_tools: extract helper for handling inlined tool configuration

Browse source
This commit is contained in:
Yuya Nishihara 2023-08-04 07:25:22 +09:00
parent e00cb0fe08
commit 962cd25821
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/merge_tools.rs
View file

@ -510,25 +510,24 @@ impl MergeTool {
} }
pub fn with_edit_args(command_args: &CommandNameAndArgs) -> Self { pub fn with_edit_args(command_args: &CommandNameAndArgs) -> Self {
let (name, args) = command_args.split_name_and_args(); Self::with_args_inner(command_args, |tool| &mut tool.edit_args)
let mut tool = MergeTool {
program: name.into_owned(),
..Default::default()
};
if !args.is_empty() {
tool.edit_args = args.to_vec();
}
tool
} }
pub fn with_merge_args(command_args: &CommandNameAndArgs) -> Self { pub fn with_merge_args(command_args: &CommandNameAndArgs) -> Self {
Self::with_args_inner(command_args, |tool| &mut tool.merge_args)
}
fn with_args_inner(
command_args: &CommandNameAndArgs,
get_mut_args: impl FnOnce(&mut Self) -> &mut Vec<String>,
) -> Self {
let (name, args) = command_args.split_name_and_args(); let (name, args) = command_args.split_name_and_args();
let mut tool = MergeTool { let mut tool = MergeTool {
program: name.into_owned(), program: name.into_owned(),
..Default::default() ..Default::default()
}; };
if !args.is_empty() { if !args.is_empty() {
tool.merge_args = args.to_vec(); *get_mut_args(&mut tool) = args.to_vec();
} }
tool tool
} }
@ -557,17 +556,26 @@ pub fn get_tool_config(
} }
} }
/// Loads merge tool options from `[merge-tools.<name>]` if `args` is of
/// unstructured string type.
fn get_tool_config_from_args(
settings: &UserSettings,
args: &CommandNameAndArgs,
) -> Result<Option<MergeTool>, ConfigError> {
match args {
CommandNameAndArgs::String(name) => get_tool_config(settings, name),
CommandNameAndArgs::Vec(_) | CommandNameAndArgs::Structured { .. } => Ok(None),
}
}
fn get_diff_editor_from_settings( fn get_diff_editor_from_settings(
ui: &Ui, ui: &Ui,
settings: &UserSettings, settings: &UserSettings,
) -> Result<MergeTool, ExternalToolError> { ) -> Result<MergeTool, ExternalToolError> {
let args = editor_args_from_settings(ui, settings, "ui.diff-editor")?; let args = editor_args_from_settings(ui, settings, "ui.diff-editor")?;
let maybe_editor = match &args { let editor = get_tool_config_from_args(settings, &args)?
CommandNameAndArgs::String(name) => get_tool_config(settings, name)?, .unwrap_or_else(|| MergeTool::with_edit_args(&args));
CommandNameAndArgs::Vec(_) => None, Ok(editor)
CommandNameAndArgs::Structured { .. } => None,
};
Ok(maybe_editor.unwrap_or_else(|| MergeTool::with_edit_args(&args)))
} }
fn get_merge_tool_from_settings( fn get_merge_tool_from_settings(
@ -575,12 +583,8 @@ fn get_merge_tool_from_settings(
settings: &UserSettings, settings: &UserSettings,
) -> Result<MergeTool, ExternalToolError> { ) -> Result<MergeTool, ExternalToolError> {
let args = editor_args_from_settings(ui, settings, "ui.merge-editor")?; let args = editor_args_from_settings(ui, settings, "ui.merge-editor")?;
let maybe_editor = match &args { let editor = get_tool_config_from_args(settings, &args)?
CommandNameAndArgs::String(name) => get_tool_config(settings, name)?, .unwrap_or_else(|| MergeTool::with_merge_args(&args));
CommandNameAndArgs::Vec(_) => None,
CommandNameAndArgs::Structured { .. } => None,
};
let editor = maybe_editor.unwrap_or_else(|| MergeTool::with_merge_args(&args));
if editor.merge_args.is_empty() { if editor.merge_args.is_empty() {
Err(ExternalToolError::MergeArgsNotConfigured { Err(ExternalToolError::MergeArgsNotConfigured {
tool_name: args.to_string(), tool_name: args.to_string(),