mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-11 23:08:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

cli: inline CommandHelper::load_template_aliases()

Browse source 
There are no external callers, and WorkspaceCommandEnvironment might have to
keep a separate copy of UserSettings in order to address #5144.
This commit is contained in:
Yuya Nishihara 2024-12-29 17:31:28 +09:00
parent 5515d2fb3c
commit 4ed3ce0d2b
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/src/cli_util.rs
View file

@ -347,14 +347,6 @@ impl CommandHelper {
&self.data.revset_extensions
}
/// Loads template aliases from the configs.
///
/// For most commands that depend on a loaded repo, you should use
/// `WorkspaceCommandHelper::template_aliases_map()` instead.
fn load_template_aliases(&self, ui: &Ui) -> Result<TemplateAliasesMap, CommandError> {
load_template_aliases(ui, self.settings().config())
}
/// Parses template of the given language into evaluation tree.
///
/// This function also loads template aliases from the settings. Use
@ -368,7 +360,7 @@ impl CommandHelper {
wrap_self: impl Fn(PropertyPlaceholder<C>) -> L::Property,
) -> Result<TemplateRenderer<'a, C>, CommandError> {
let mut diagnostics = TemplateDiagnostics::new();
let aliases = self.load_template_aliases(ui)?;
let aliases = load_template_aliases(ui, self.settings().config())?;
let template = template_builder::parse(
language,
&mut diagnostics,
@ -736,7 +728,7 @@ impl WorkspaceCommandEnvironment {
#[instrument(skip_all)]
fn new(ui: &Ui, command: &CommandHelper, workspace: &Workspace) -> Result<Self, CommandError> {
let revset_aliases_map = revset_util::load_revset_aliases(ui, command.settings().config())?;
let template_aliases_map = command.load_template_aliases(ui)?;
let template_aliases_map = load_template_aliases(ui, command.settings().config())?;
let path_converter = RepoPathUiConverter::Fs {
cwd: command.cwd().to_owned(),
base: workspace.workspace_root().to_owned(),