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

Allow bare words to interpolate (#5327)

Browse Source 
* Allow bare words to interpolate

* fix highlighting
This commit is contained in:
JT
2022-04-26 11:44:44 +12:00
committed by GitHub
parent 190f379ff3
commit 3492d4015d
3 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1726,6 +1726,7 @@ pub fn parse_cell_path(
working_set: &mut StateWorkingSet,
tokens: impl Iterator<Item = Token>,
mut expect_dot: bool,
expand_aliases_denylist: &[usize],
span: Span,
) -> (Vec<PathMember>, Option<ParseError>) {
let mut error = None;
@ -1755,7 +1756,8 @@ pub fn parse_cell_path(
span,
}),
_ => {
let (result, err) = parse_string(working_set, path_element.span);
let (result, err) =
parse_string(working_set, path_element.span, expand_aliases_denylist);
error = error.or(err);
match result {
Expression {
@ -1885,7 +1887,13 @@ pub fn parse_full_cell_path(
);
};
let (tail, err) = parse_cell_path(working_set, tokens, expect_dot, span);
let (tail, err) = parse_cell_path(
working_set,
tokens,
expect_dot,
expand_aliases_denylist,
span,
);
error = error.or(err);
if !tail.is_empty() {
@ -2475,11 +2483,17 @@ pub fn unescape_unquote_string(bytes: &[u8], span: Span) -> (String, Option<Pars
pub fn parse_string(
working_set: &mut StateWorkingSet,
span: Span,
expand_aliases_denylist: &[usize],
) -> (Expression, Option<ParseError>) {
trace!("parsing: string");
let bytes = working_set.get_span_contents(span);
// Check for bare word interpolation
if bytes[0] != b'\'' && bytes[0] != b'"' && bytes[0] != b'`' && bytes.contains(&b'(') {
return parse_string_interpolation(working_set, span, expand_aliases_denylist);
}
let (s, err) = unescape_unquote_string(bytes, span);
(
@ -3899,7 +3913,7 @@ pub fn parse_value(
SyntaxShape::Filepath => parse_filepath(working_set, span),
SyntaxShape::Directory => parse_directory(working_set, span),
SyntaxShape::GlobPattern => parse_glob_pattern(working_set, span),
SyntaxShape::String => parse_string(working_set, span),
SyntaxShape::String => parse_string(working_set, span, expand_aliases_denylist),
SyntaxShape::Binary => parse_binary(working_set, span),
SyntaxShape::Signature => {
if bytes.starts_with(b"[") {
@ -3940,7 +3954,8 @@ pub fn parse_value(
let tokens = tokens.into_iter().peekable();
let (cell_path, err) = parse_cell_path(working_set, tokens, false, span);
let (cell_path, err) =
parse_cell_path(working_set, tokens, false, expand_aliases_denylist, span);
error = error.or(err);
(