mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-27 06:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

templater: check number of method arguments

Browse source
This commit is contained in:
Yuya Nishihara 2023-02-04 17:26:00 +09:00
parent 28c1989257
commit a4be118981
2 changed files with 79 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
src/template_parser.rs
View file

@ -267,6 +267,16 @@ impl<'a, C: 'a> Expression<'a, C> {
type OptionalArg<'i> = Option<Pair<'i, Rule>>;
fn expect_no_arguments(pair: Pair<Rule>) -> Result<(), TemplateParseError> {
let span = pair.as_span();
let mut pairs = pair.into_inner();
if pairs.next().is_none() {
Ok(())
} else {
Err(TemplateParseError::invalid_argument_count_exact(0, span))
}
}
/// Extracts exactly N required arguments.
fn expect_exact_arguments<const N: usize>(
pair: Pair<Rule>,
@ -388,15 +398,17 @@ fn chain_properties<'a, I: 'a, J: 'a, O: 'a>(
fn parse_string_method<'a, I: 'a>(
self_property: impl TemplateProperty<I, Output = String> + 'a,
name: Pair<Rule>,
_args_pair: Pair<Rule>,
args_pair: Pair<Rule>,
_parse_keyword: &impl Fn(Pair<Rule>) -> TemplateParseResult<PropertyAndLabels<'a, I>>,
) -> TemplateParseResult<Property<'a, I>> {
// TODO: validate arguments
let property = match name.as_str() {
"first_line" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(|s: &String| s.lines().next().unwrap_or_default().to_string()),
)),
"first_line" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(|s: &String| s.lines().next().unwrap_or_default().to_string()),
))
}
_ => return Err(TemplateParseError::no_such_method("String", &name)),
};
Ok(property)
@ -414,23 +426,31 @@ fn parse_boolean_method<'a, I: 'a>(
fn parse_commit_or_change_id_method<'a, I: 'a>(
self_property: impl TemplateProperty<I, Output = CommitOrChangeId<'a>> + 'a,
name: Pair<Rule>,
_args_pair: Pair<Rule>,
args_pair: Pair<Rule>,
_parse_keyword: &impl Fn(Pair<Rule>) -> TemplateParseResult<PropertyAndLabels<'a, I>>,
) -> TemplateParseResult<Property<'a, I>> {
// TODO: validate arguments
let property = match name.as_str() {
"short" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.short()),
)),
"shortest_prefix_and_brackets" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.shortest_prefix_and_brackets()),
)),
"shortest_styled_prefix" => Property::IdWithHighlightedPrefix(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.shortest_styled_prefix()),
)),
"short" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.short()),
))
}
"shortest_prefix_and_brackets" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.shortest_prefix_and_brackets()),
))
}
"shortest_styled_prefix" => {
expect_no_arguments(args_pair)?;
Property::IdWithHighlightedPrefix(chain_properties(
self_property,
TemplatePropertyFn(|id: &CommitOrChangeId| id.shortest_styled_prefix()),
))
}
_ => {
return Err(TemplateParseError::no_such_method(
"CommitOrChangeId",
@ -444,23 +464,31 @@ fn parse_commit_or_change_id_method<'a, I: 'a>(
fn parse_signature_method<'a, I: 'a>(
self_property: impl TemplateProperty<I, Output = Signature> + 'a,
name: Pair<Rule>,
_args_pair: Pair<Rule>,
args_pair: Pair<Rule>,
_parse_keyword: &impl Fn(Pair<Rule>) -> TemplateParseResult<PropertyAndLabels<'a, I>>,
) -> TemplateParseResult<Property<'a, I>> {
// TODO: validate arguments
let property = match name.as_str() {
"name" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.name.clone()),
)),
"email" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.email.clone()),
)),
"timestamp" => Property::Timestamp(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.timestamp.clone()),
)),
"name" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.name.clone()),
))
}
"email" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.email.clone()),
))
}
"timestamp" => {
expect_no_arguments(args_pair)?;
Property::Timestamp(chain_properties(
self_property,
TemplatePropertyFn(|signature: &Signature| signature.timestamp.clone()),
))
}
_ => return Err(TemplateParseError::no_such_method("Signature", &name)),
};
Ok(property)
@ -469,15 +497,17 @@ fn parse_signature_method<'a, I: 'a>(
fn parse_timestamp_method<'a, I: 'a>(
self_property: impl TemplateProperty<I, Output = Timestamp> + 'a,
name: Pair<Rule>,
_args_pair: Pair<Rule>,
args_pair: Pair<Rule>,
_parse_keyword: &impl Fn(Pair<Rule>) -> TemplateParseResult<PropertyAndLabels<'a, I>>,
) -> TemplateParseResult<Property<'a, I>> {
// TODO: validate arguments
let property = match name.as_str() {
"ago" => Property::String(chain_properties(
self_property,
TemplatePropertyFn(time_util::format_timestamp_relative_to_now),
)),
"ago" => {
expect_no_arguments(args_pair)?;
Property::String(chain_properties(
self_property,
TemplatePropertyFn(time_util::format_timestamp_relative_to_now),
))
}
_ => return Err(TemplateParseError::no_such_method("Timestamp", &name)),
};
Ok(property)

9
tests/test_templater.rs
View file

@ -148,6 +148,15 @@ fn test_templater_parse_error() {
= Method "foo" doesn't exist for type "String"
"###);
insta::assert_snapshot!(render_err(r#"description.first_line("foo")"#), @r###"
Error: Failed to parse template: --> 1:24
|
1 | description.first_line("foo")
| ^---^
|
= Expected 0 arguments
"###);
insta::assert_snapshot!(render_err(r#"label()"#), @r###"
Error: Failed to parse template: --> 1:7
|