mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-18 10:07:28 +00:00
revset: report unknown function with span
This commit is contained in:
parent
fdbd44571d
commit
aeee0acd08
2 changed files with 39 additions and 28 deletions
|
@ -622,9 +622,8 @@ fn parse_primary_rule(
|
||||||
match first.as_rule() {
|
match first.as_rule() {
|
||||||
Rule::expression => parse_expression_rule(first.into_inner(), workspace_ctx),
|
Rule::expression => parse_expression_rule(first.into_inner(), workspace_ctx),
|
||||||
Rule::function_name => {
|
Rule::function_name => {
|
||||||
let name = first.as_str().to_owned();
|
|
||||||
let argument_pairs = pairs.next().unwrap().into_inner();
|
let argument_pairs = pairs.next().unwrap().into_inner();
|
||||||
parse_function_expression(name, argument_pairs, workspace_ctx)
|
parse_function_expression(first, argument_pairs, workspace_ctx)
|
||||||
}
|
}
|
||||||
Rule::symbol => parse_symbol_rule(first.into_inner()),
|
Rule::symbol => parse_symbol_rule(first.into_inner()),
|
||||||
_ => {
|
_ => {
|
||||||
|
@ -655,46 +654,47 @@ fn parse_symbol_rule(mut pairs: Pairs<Rule>) -> Result<Rc<RevsetExpression>, Rev
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_function_expression(
|
fn parse_function_expression(
|
||||||
name: String,
|
name_pair: Pair<Rule>,
|
||||||
argument_pairs: Pairs<Rule>,
|
argument_pairs: Pairs<Rule>,
|
||||||
workspace_ctx: Option<&RevsetWorkspaceContext>,
|
workspace_ctx: Option<&RevsetWorkspaceContext>,
|
||||||
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
|
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
|
||||||
match name.as_str() {
|
let name = name_pair.as_str();
|
||||||
|
match name {
|
||||||
"parents" => {
|
"parents" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(expression.parents())
|
Ok(expression.parents())
|
||||||
}
|
}
|
||||||
"children" => {
|
"children" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(expression.children())
|
Ok(expression.children())
|
||||||
}
|
}
|
||||||
"ancestors" => {
|
"ancestors" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(expression.ancestors())
|
Ok(expression.ancestors())
|
||||||
}
|
}
|
||||||
"descendants" => {
|
"descendants" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let expression = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(expression.descendants())
|
Ok(expression.descendants())
|
||||||
}
|
}
|
||||||
"connected" => {
|
"connected" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(candidates.connected())
|
Ok(candidates.connected())
|
||||||
}
|
}
|
||||||
"none" => {
|
"none" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::none())
|
Ok(RevsetExpression::none())
|
||||||
}
|
}
|
||||||
"all" => {
|
"all" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::all())
|
Ok(RevsetExpression::all())
|
||||||
}
|
}
|
||||||
"heads" => {
|
"heads" => {
|
||||||
if let Some(arg) = expect_one_optional_argument(&name, argument_pairs)? {
|
if let Some(arg) = expect_one_optional_argument(name, argument_pairs)? {
|
||||||
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(candidates.heads())
|
Ok(candidates.heads())
|
||||||
} else {
|
} else {
|
||||||
|
@ -702,43 +702,43 @@ fn parse_function_expression(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"roots" => {
|
"roots" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
let candidates = parse_expression_rule(arg.into_inner(), workspace_ctx)?;
|
||||||
Ok(candidates.roots())
|
Ok(candidates.roots())
|
||||||
}
|
}
|
||||||
"public_heads" => {
|
"public_heads" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::public_heads())
|
Ok(RevsetExpression::public_heads())
|
||||||
}
|
}
|
||||||
"branches" => {
|
"branches" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::branches())
|
Ok(RevsetExpression::branches())
|
||||||
}
|
}
|
||||||
"remote_branches" => {
|
"remote_branches" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::remote_branches())
|
Ok(RevsetExpression::remote_branches())
|
||||||
}
|
}
|
||||||
"tags" => {
|
"tags" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::tags())
|
Ok(RevsetExpression::tags())
|
||||||
}
|
}
|
||||||
"git_refs" => {
|
"git_refs" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::git_refs())
|
Ok(RevsetExpression::git_refs())
|
||||||
}
|
}
|
||||||
"git_head" => {
|
"git_head" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::git_head())
|
Ok(RevsetExpression::git_head())
|
||||||
}
|
}
|
||||||
"merges" => {
|
"merges" => {
|
||||||
expect_no_arguments(&name, argument_pairs)?;
|
expect_no_arguments(name, argument_pairs)?;
|
||||||
Ok(RevsetExpression::all().with_parent_count(2..u32::MAX))
|
Ok(RevsetExpression::all().with_parent_count(2..u32::MAX))
|
||||||
}
|
}
|
||||||
"description" | "author" | "committer" => {
|
"description" | "author" | "committer" => {
|
||||||
let arg = expect_one_argument(&name, argument_pairs)?;
|
let arg = expect_one_argument(name, argument_pairs)?;
|
||||||
let needle = parse_function_argument_to_string(&name, arg.into_inner())?;
|
let needle = parse_function_argument_to_string(name, arg.into_inner())?;
|
||||||
let candidates = RevsetExpression::all();
|
let candidates = RevsetExpression::all();
|
||||||
match name.as_str() {
|
match name {
|
||||||
"description" => Ok(candidates.with_description(needle)),
|
"description" => Ok(candidates.with_description(needle)),
|
||||||
"author" => Ok(candidates.with_author(needle)),
|
"author" => Ok(candidates.with_author(needle)),
|
||||||
"committer" => Ok(candidates.with_committer(needle)),
|
"committer" => Ok(candidates.with_committer(needle)),
|
||||||
|
@ -752,7 +752,7 @@ fn parse_function_expression(
|
||||||
let paths = argument_pairs
|
let paths = argument_pairs
|
||||||
.map(|arg| {
|
.map(|arg| {
|
||||||
let span = arg.as_span();
|
let span = arg.as_span();
|
||||||
let needle = parse_function_argument_to_string(&name, arg.into_inner())?;
|
let needle = parse_function_argument_to_string(name, arg.into_inner())?;
|
||||||
let path = RepoPath::parse_fs_path(ctx.cwd, ctx.workspace_root, &needle)
|
let path = RepoPath::parse_fs_path(ctx.cwd, ctx.workspace_root, &needle)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
RevsetParseError::with_span(
|
RevsetParseError::with_span(
|
||||||
|
@ -766,7 +766,7 @@ fn parse_function_expression(
|
||||||
if paths.is_empty() {
|
if paths.is_empty() {
|
||||||
Err(RevsetParseError::new(
|
Err(RevsetParseError::new(
|
||||||
RevsetParseErrorKind::InvalidFunctionArguments {
|
RevsetParseErrorKind::InvalidFunctionArguments {
|
||||||
name,
|
name: name.to_owned(),
|
||||||
message: "Expected at least 1 argument".to_string(),
|
message: "Expected at least 1 argument".to_string(),
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
|
@ -779,9 +779,10 @@ fn parse_function_expression(
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => Err(RevsetParseError::new(RevsetParseErrorKind::NoSuchFunction(
|
_ => Err(RevsetParseError::with_span(
|
||||||
name,
|
RevsetParseErrorKind::NoSuchFunction(name.to_owned()),
|
||||||
))),
|
name_pair.as_span(),
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,4 +31,14 @@ fn test_bad_function_call() {
|
||||||
|
|
|
|
||||||
= Invalid file pattern: Path "../out" is not in the repo
|
= Invalid file pattern: Path "../out" is not in the repo
|
||||||
"###);
|
"###);
|
||||||
|
|
||||||
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "root:whatever()"]);
|
||||||
|
insta::assert_snapshot!(stderr, @r###"
|
||||||
|
Error: Failed to parse revset: --> 1:6
|
||||||
|
|
|
||||||
|
1 | root:whatever()
|
||||||
|
| ^------^
|
||||||
|
|
|
||||||
|
= Revset function "whatever" doesn't exist
|
||||||
|
"###);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue