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

templater: do not rewrite non-argument errors raised from self methods

Browse source 
I'm going to add new "self.immutable()" method, which takes no arguments but
can fail if the configured revset is wrong.
This commit is contained in:
Yuya Nishihara 2024-03-13 21:07:13 +09:00
parent 78104b5e82
commit 04d5f59cbb
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
cli/src/template_builder.rs
View file

@ -442,27 +442,31 @@ fn build_keyword<'a, L: TemplateLanguage<'a> + ?Sized>(
args: vec![],
args_span: name_span.end_pos().span(&name_span.end_pos()),
};
match language.build_method(build_ctx, self_property, &function) {
Ok(property) => Ok(Expression::with_label(property, name)),
Err(err) => {
let kind = if let TemplateParseErrorKind::NoSuchMethod { candidates, .. } = err.kind() {
TemplateParseErrorKind::NoSuchKeyword {
language
.build_method(build_ctx, self_property, &function)
.map(|property| Expression::with_label(property, name))
.map_err(|err| match err.kind() {
TemplateParseErrorKind::NoSuchMethod { candidates, .. } => {
let kind = TemplateParseErrorKind::NoSuchKeyword {
name: name.to_owned(),
// TODO: filter methods by arity?
candidates: candidates.clone(),
}
} else {
// Since keyword is a 0-ary method, any argument-related errors
// mean there's no such keyword.
TemplateParseErrorKind::NoSuchKeyword {
};
TemplateParseError::with_span(kind, name_span)
}
// Since keyword is a 0-ary method, any argument errors mean there's
// no such keyword.
TemplateParseErrorKind::InvalidArguments { .. } => {
let kind = TemplateParseErrorKind::NoSuchKeyword {
name: name.to_owned(),
// TODO: might be better to phrase the error differently
candidates: vec![format!("self.{name}(..)")],
}
};
Err(TemplateParseError::with_span(kind, name_span))
}
}
};
TemplateParseError::with_span(kind, name_span)
}
// The keyword function may fail with the other reasons.
_ => err,
})
}
fn build_unary_operation<'a, L: TemplateLanguage<'a> + ?Sized>(