From 9111cd8a3d12c9808efc4402e98e267a19be04ab Mon Sep 17 00:00:00 2001 From: harupy Date: Sat, 10 Dec 2022 18:09:26 +0900 Subject: [PATCH] Fix plain string --- ...n_parser__string__tests__parse_string_concat.snap | 2 +- ...rser__string__tests__parse_u_string_concat_1.snap | 2 +- ...rser__string__tests__parse_u_string_concat_2.snap | 2 +- parser/src/string.rs | 12 +++++------- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap index 0052f8d..a874426 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap @@ -24,7 +24,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 8, + column: 16, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap index 503d5b5..868ba81 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap @@ -24,7 +24,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 8, + column: 17, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap index 4326259..a24fc2b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap @@ -24,7 +24,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 9, + column: 17, }, ), custom: (), diff --git a/parser/src/string.rs b/parser/src/string.rs index 5a8e3e6..3d0a452 100644 --- a/parser/src/string.rs +++ b/parser/src/string.rs @@ -82,18 +82,16 @@ pub fn parse_strings( deduped.push(take_current(&mut current)); } - Ok(if has_fstring { - Expr::new( - initial_start, - last_end, - ExprKind::JoinedStr { values: deduped }, - ) + let node = if has_fstring { + ExprKind::JoinedStr { values: deduped } } else { deduped .into_iter() .exactly_one() .expect("String must be concatenated to a single element.") - }) + .node + }; + Ok(Expr::new(initial_start, last_end, node)) } #[cfg(test)]