holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suggest existing variables on not found (#8902)

Browse Source
This commit is contained in:
sam schick
2023-05-02 11:17:14 -04:00
committed by GitHub
parent 517dc6d39e
commit d45e9671d4
8 changed files with 184 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu-parser/src/parser.rs
View File

@ -16,8 +16,8 @@ use nu_protocol::{
Operator, PathMember, Pattern, Pipeline, PipelineElement, RangeInclusion, RangeOperator,
},
engine::StateWorkingSet,
span, BlockId, Flag, ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type,
Unit, VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
span, BlockId, DidYouMean, Flag, ParseError, PositionalArg, Signature, Span, Spanned,
SyntaxShape, Type, Unit, VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
};
use crate::parse_keywords::{
@ -1820,9 +1820,7 @@ pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Exp
};
}
let id = parse_variable(working_set, span);
if let Some(id) = id {
if let Some(id) = parse_variable(working_set, span) {
Expression {
expr: Expr::Var(id),
span,
@ -1830,7 +1828,9 @@ pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Exp
custom_completion: None,
}
} else {
working_set.error(ParseError::VariableNotFound(span));
let ws = &*working_set;
let suggestion = DidYouMean::new(&ws.list_variables(), ws.get_span_contents(span));
working_set.error(ParseError::VariableNotFound(suggestion, span));
garbage(span)
}
}

4
crates/nu-parser/tests/test_parser.rs
View File

@ -1955,7 +1955,7 @@ mod input_types {
assert!(matches!(
working_set.parse_errors.first(),
Some(ParseError::VariableNotFound(_))
Some(ParseError::VariableNotFound(_, _))
));
}
@ -1974,7 +1974,7 @@ mod input_types {
assert!(matches!(
working_set.parse_errors.first(),
Some(ParseError::VariableNotFound(_))
Some(ParseError::VariableNotFound(_, _))
));
}
}