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

templater: add separate variants for exact/range argument count errors

Browse source 
I believe this isn't a good abstraction, but I need to add one more variant
for "at least n arguments" error. A stringified count like "2 to 3" could be
embedded in an error variant, but I don't think it's good idea to build error
message in that way.
This commit is contained in:
Yuya Nishihara 2023-02-04 00:01:53 +09:00
parent 1883d62805
commit 5850575d53
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/template_parser.rs
View file

@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use std::ops::RangeInclusive;
use std::{error, fmt};
use itertools::Itertools as _;
@ -53,11 +54,11 @@ pub enum TemplateParseErrorKind {
NoSuchFunction(String),
#[error(r#"Method "{name}" doesn't exist for type "{type_name}""#)]
NoSuchMethod { type_name: String, name: String },
#[error(
"Expected {} arguments",
if min == max { format!("{min}") } else { format!("{min} to {max}") },
)]
InvalidArgumentCount { min: usize, max: usize },
// TODO: clean up argument error variants
#[error("Expected {0} arguments")]
InvalidArgumentCountExact(usize),
#[error("Expected {} to {} arguments", .0.start(), .0.end())]
InvalidArgumentCountRange(RangeInclusive<usize>),
#[error(r#"Expected argument of type "{0}""#)]
InvalidArgumentType(String),
}
@ -97,9 +98,16 @@ impl TemplateParseError {
)
}
fn invalid_argument_count(min: usize, max: usize, span: pest::Span<'_>) -> Self {
fn invalid_argument_count_exact(count: usize, span: pest::Span<'_>) -> Self {
TemplateParseError::with_span(
TemplateParseErrorKind::InvalidArgumentCount { min, max },
TemplateParseErrorKind::InvalidArgumentCountExact(count),
span,
)
}
fn invalid_argument_count_range(count: RangeInclusive<usize>, span: pest::Span<'_>) -> Self {
TemplateParseError::with_span(
TemplateParseErrorKind::InvalidArgumentCountRange(count),
span,
)
}
@ -477,7 +485,7 @@ fn parse_commit_term<'a>(
let expression = match name.as_str() {
"label" => {
let arg_count_error =
|| TemplateParseError::invalid_argument_count(2, 2, args_span);
|| TemplateParseError::invalid_argument_count_exact(2, args_span);
let label_pair = args.next().ok_or_else(arg_count_error)?;
let label_property =
parse_commit_template_rule(repo, workspace_id, label_pair)?
@ -496,7 +504,7 @@ fn parse_commit_term<'a>(
}
"if" => {
let arg_count_error =
|| TemplateParseError::invalid_argument_count(2, 3, args_span);
|| TemplateParseError::invalid_argument_count_range(2..=3, args_span);
let condition_pair = args.next().ok_or_else(arg_count_error)?;
let condition_span = condition_pair.as_span();
let condition = parse_commit_template_rule(repo, workspace_id, condition_pair)?