From d45ac01ebe86d21da4b48c8cd205d86a4b4cfc15 Mon Sep 17 00:00:00 2001 From: harupy Date: Sat, 10 Dec 2022 18:45:36 +0900 Subject: [PATCH] Fix --- ...ython_parser__string__tests__parse_f_string_concat_1.snap | 2 +- ...ython_parser__string__tests__parse_f_string_concat_2.snap | 2 +- ...ython_parser__string__tests__parse_f_string_concat_3.snap | 2 +- ...hon_parser__string__tests__parse_u_f_string_concat_1.snap | 2 +- ...hon_parser__string__tests__parse_u_f_string_concat_2.snap | 2 +- parser/src/string.rs | 5 ++--- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap index 9b1f566..bfe109e 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap @@ -38,7 +38,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_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap index 9b1f566..bfe109e 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap @@ -38,7 +38,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_f_string_concat_3.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap index 0d7ebca..87b9212 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap @@ -38,7 +38,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 8, + column: 22, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap index 2449dff..76e6b1d 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap @@ -38,7 +38,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 9, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap index f56ae0f..8c073fd 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap @@ -38,7 +38,7 @@ expression: parse_ast end_location: Some( Location { row: 1, - column: 9, + column: 22, }, ), custom: (), diff --git a/parser/src/string.rs b/parser/src/string.rs index 3d0a452..cf18de9 100644 --- a/parser/src/string.rs +++ b/parser/src/string.rs @@ -11,7 +11,6 @@ pub fn parse_strings( ) -> Result { // Preserve the initial location and kind. let initial_start = values[0].0; - let initial_end = values[0].2; let last_end = values.last().unwrap().2; let initial_kind = (values[0].1 .1 == StringKind::U).then(|| "u".to_owned()); @@ -20,7 +19,7 @@ pub fn parse_strings( let value = values.into_iter().last().unwrap().1 .0; return Ok(Expr::new( initial_start, - initial_end, + last_end, ExprKind::Constant { value: Constant::Str(value), kind: initial_kind, @@ -39,7 +38,7 @@ pub fn parse_strings( let take_current = |current: &mut Vec| -> Expr { Expr::new( initial_start, - initial_end, + last_end, ExprKind::Constant { value: Constant::Str(current.drain(..).join("")), kind: initial_kind.clone(),