extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify working_set.error usage. (#12531)

Browse Source 
# Description
A little refactor that use `working_set.error` rather than
`working_set.parse_errors.push`, which is reported here:
https://github.com/nushell/nushell/pull/12238

> Inconsistent error reporting. Usage of both working_set.error() and
working_set.parse_errors.push(). Using ParseError::Expected for an
invalid variable name when there's ParseError::VariableNotValid (from
parser.rs:5237). Checking variable names manually when there's
is_variable() (from parser.rs:2905).

# User-Facing Changes
NaN

# Tests + Formatting
Done
This commit is contained in:
Wind 2024-04-16 21:47:10 +08:00 committed by GitHub
parent 62555c997e
commit e6fbf7d01d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-parser/src/parse_keywords.rs
View File

@ -459,7 +459,7 @@ pub fn parse_def(
let block = working_set.get_block_mut(*block_id); let block = working_set.get_block_mut(*block_id);
block.signature = Box::new(sig.clone()); block.signature = Box::new(sig.clone());
} }
_ => working_set.parse_errors.push(ParseError::Expected( _ => working_set.error(ParseError::Expected(
"definition body closure { ... }", "definition body closure { ... }",
arg.span, arg.span,
)), )),
@ -2957,7 +2957,7 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
); );
if let Some(parse_error) = parse_error { if let Some(parse_error) = parse_error {
working_set.parse_errors.push(parse_error) working_set.error(parse_error)
} }
let rvalue_span = nu_protocol::span(&spans[(span.0 + 1)..]); let rvalue_span = nu_protocol::span(&spans[(span.0 + 1)..]);
@ -3221,7 +3221,7 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
); );
if let Some(parse_error) = parse_error { if let Some(parse_error) = parse_error {
working_set.parse_errors.push(parse_error) working_set.error(parse_error);
} }
let rvalue_span = nu_protocol::span(&spans[(span.0 + 1)..]); let rvalue_span = nu_protocol::span(&spans[(span.0 + 1)..]);

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

@ -2915,7 +2915,7 @@ pub fn parse_var_with_opt_type(
lex_signature(&type_bytes, full_span.start, &[b','], &[], true); lex_signature(&type_bytes, full_span.start, &[b','], &[], true);
if let Some(parse_error) = parse_error { if let Some(parse_error) = parse_error {
working_set.parse_errors.push(parse_error); working_set.error(parse_error);
} }
let ty = parse_type(working_set, &type_bytes, tokens[0].span); let ty = parse_type(working_set, &type_bytes, tokens[0].span);
@ -3045,7 +3045,7 @@ pub fn parse_input_output_types(
lex_signature(bytes, full_span.start, &[b'\n', b'\r', b','], &[], true); lex_signature(bytes, full_span.start, &[b'\n', b'\r', b','], &[], true);
if let Some(parse_error) = parse_error { if let Some(parse_error) = parse_error {
working_set.parse_errors.push(parse_error); working_set.error(parse_error);
} }
let mut output = vec![]; let mut output = vec![];