Merge pull request RustPython#4220 from charliermarsh/charlie/str-loc

Start string location at kind or quote prefix

Author: youknowone

compiler/parser/src/lexer.rs

@@ -205,7 +205,9 @@ where
 
             // Check if we have a string:
             if self.chr0 == Some('"') || self.chr0 == Some('\'') {
-                return self.lex_string(saw_b, saw_r, saw_u, saw_f);
+                return self
+                    .lex_string(saw_b, saw_r, saw_u, saw_f)
+                    .map(|(_, tok, end_pos)| (start_pos, tok, end_pos));
             }
         }
 

compiler/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap

@@ -131,4 +131,11 @@ mod tests {
         let parse_ast = parse_program(&source, "<test>").unwrap();
         insta::assert_debug_snapshot!(parse_ast);
     }
+
+    #[test]
+    fn test_parse_string_triple_quotes_with_kind() {
+        let source = String::from("u'''Hello, world!'''");
+        let parse_ast = parse_program(&source, "<test>").unwrap();
+        insta::assert_debug_snapshot!(parse_ast);
+    }
 }