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

Move uses of trim_quotes to unescape for filenames (#5398)

Browse Source 
* Move uses of trim_quotes to unescape for filenames

* Fix Windows tests
This commit is contained in:
JT
2022-05-02 06:37:20 +12:00
committed by GitHub
parent 80d57d70cd
commit 98ab31e15e
4 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1928,10 +1928,10 @@ pub fn parse_directory(
span: Span,
) -> (Expression, Option<ParseError>) {
let bytes = working_set.get_span_contents(span);
let bytes = trim_quotes(bytes);
let (token, err) = unescape_unquote_string(bytes, span);
trace!("parsing: directory");
if let Ok(token) = String::from_utf8(bytes.into()) {
if err.is_none() {
trace!("-- found {}", token);
(
Expression {
@ -1955,10 +1955,10 @@ pub fn parse_filepath(
span: Span,
) -> (Expression, Option<ParseError>) {
let bytes = working_set.get_span_contents(span);
let bytes = trim_quotes(bytes);
let (token, err) = unescape_unquote_string(bytes, span);
trace!("parsing: filepath");
if let Ok(token) = String::from_utf8(bytes.into()) {
if err.is_none() {
trace!("-- found {}", token);
(
Expression {
@ -2267,12 +2267,11 @@ pub fn parse_glob_pattern(
working_set: &mut StateWorkingSet,
span: Span,
) -> (Expression, Option<ParseError>) {
let bytes = working_set.get_span_contents(span);
let (token, err) = unescape_unquote_string(bytes, span);
trace!("parsing: glob pattern");
let bytes = working_set.get_span_contents(span);
let bytes = trim_quotes(bytes);
if let Ok(token) = String::from_utf8(bytes.into()) {
if err.is_none() {
trace!("-- found {}", token);
(
Expression {