mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 15:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: add specialized function for pre-validated templates

Browse source 
I'll make parse_<language>_template() require &Ui, but these cached templates
should be re-constructible without access to a Ui.

Maybe we can split a parsed template object into RevsetExpression-like
evaluation tree and interpreter environment, but that'll be a big challenge.
This commit is contained in:
Yuya Nishihara 2024-09-19 14:46:11 +09:00
parent 3c04507097
commit 09cedd83a7
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cli/src/cli_util.rs
View file

@ -1354,6 +1354,18 @@ impl WorkspaceCommandHelper {
self.env.parse_template(language, template_text, wrap_self)
}
/// Parses template that is validated by `Self::new()`.
fn reparse_valid_template<'a, C: Clone + 'a, L: TemplateLanguage<'a> + ?Sized>(
&self,
language: &L,
template_text: &str,
wrap_self: impl Fn(PropertyPlaceholder<C>) -> L::Property,
) -> TemplateRenderer<'a, C> {
let aliases = &self.env.template_aliases_map;
template_builder::parse(language, template_text, aliases, wrap_self)
.expect("parse error should be confined by WorkspaceCommandHelper::new()")
}
/// Parses commit template into evaluation tree.
pub fn parse_commit_template(
&self,
@ -1397,19 +1409,31 @@ impl WorkspaceCommandHelper {
/// Template for one-line summary of a commit.
pub fn commit_summary_template(&self) -> TemplateRenderer<'_, Commit> {
self.parse_commit_template(&self.commit_summary_template_text)
.expect("parse error should be confined by WorkspaceCommandHelper::new()")
let language = self.commit_template_language();
self.reparse_valid_template(
&language,
&self.commit_summary_template_text,
CommitTemplateLanguage::wrap_commit,
)
}
/// Template for one-line summary of an operation.
pub fn operation_summary_template(&self) -> TemplateRenderer<'_, Operation> {
self.parse_operation_template(&self.op_summary_template_text)
.expect("parse error should be confined by WorkspaceCommandHelper::new()")
let language = self.operation_template_language();
self.reparse_valid_template(
&language,
&self.op_summary_template_text,
OperationTemplateLanguage::wrap_operation,
)
}
pub fn short_change_id_template(&self) -> TemplateRenderer<'_, Commit> {
self.parse_commit_template(SHORT_CHANGE_ID_TEMPLATE_TEXT)
.expect("parse error should be confined by WorkspaceCommandHelper::new()")
let language = self.commit_template_language();
self.reparse_valid_template(
&language,
SHORT_CHANGE_ID_TEMPLATE_TEXT,
CommitTemplateLanguage::wrap_commit,
)
}
/// Returns one-line summary of the given `commit`.
@ -1957,8 +1981,12 @@ impl WorkspaceCommandTransaction<'_> {
/// Template for one-line summary of a commit within transaction.
pub fn commit_summary_template(&self) -> TemplateRenderer<'_, Commit> {
self.parse_commit_template(&self.helper.commit_summary_template_text)
.expect("parse error should be confined by WorkspaceCommandHelper::new()")
let language = self.commit_template_language();
self.helper.reparse_valid_template(
&language,
&self.helper.commit_summary_template_text,
CommitTemplateLanguage::wrap_commit,
)
}
/// Creates commit template language environment capturing the current