mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

revset: highlight whole function expression on substitution failed

Browse source 
The error may be caused by arguments passed in to the alias function.
This commit is contained in:
Yuya Nishihara 2022-11-27 20:45:35 +09:00
parent 70292f79b7
commit 7fbd7b48e5
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/revset.rs
View file

@ -694,7 +694,7 @@ fn parse_expression_rule(
.op(Op::postfix(Rule::parents_op) | Op::postfix(Rule::children_op))
});
PRATT
.map_primary(|primary| parse_primary_rule(primary.into_inner(), state))
.map_primary(|primary| parse_primary_rule(primary, state))
.map_prefix(|op, rhs| match op.as_rule() {
Rule::dag_range_pre_op | Rule::range_pre_op => Ok(rhs?.ancestors()),
r => panic!("unexpected prefix operator rule {r:?}"),
@ -718,15 +718,17 @@ fn parse_expression_rule(
}
fn parse_primary_rule(
mut pairs: Pairs<Rule>,
pair: Pair<Rule>,
state: ParseState,
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
let span = pair.as_span();
let mut pairs = pair.into_inner();
let first = pairs.next().unwrap();
match first.as_rule() {
Rule::expression => parse_expression_rule(first.into_inner(), state),
Rule::function_name => {
let arguments_pair = pairs.next().unwrap();
parse_function_expression(first, arguments_pair, state)
parse_function_expression(first, arguments_pair, state, span)
}
Rule::symbol => parse_symbol_rule(first.into_inner(), state),
_ => {
@ -775,6 +777,7 @@ fn parse_function_expression(
name_pair: Pair<Rule>,
arguments_pair: Pair<Rule>,
state: ParseState,
primary_span: pest::Span<'_>,
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
let name = name_pair.as_str();
if let Some((id, params, defn)) = state.aliases_map.get_function(name) {
@ -787,7 +790,7 @@ fn parse_function_expression(
.collect::<Result<Vec<_>, RevsetParseError>>()?;
if params.len() == args.len() {
let locals = params.iter().map(|s| s.as_str()).zip(args).collect();
state.with_alias_expanding(id, &locals, name_pair.as_span(), |state| {
state.with_alias_expanding(id, &locals, primary_span, |state| {
parse_program(defn, state)
})
} else {

4
tests/test_revset_output.rs
View file

@ -182,7 +182,7 @@ fn test_alias() {
Error: Failed to parse revset: --> 1:1
|
1 | my_author(none())
| ^-------^
| ^---------------^
|
= Alias "my_author()" cannot be expanded
--> 1:8
@ -210,7 +210,7 @@ fn test_alias() {
--> 1:1
|
1 | recurse2()
| ^------^
| ^--------^
|
= Alias "recurse2()" cannot be expanded
--> 1:1