Incorrect f-string parsing (#112)

* Fix parse_fstring * Add test * Push char * Remove unused import
RustPython · Jan 23, 2024 · 9ce55ae · 9ce55ae
1 parent 8731e9f
commit 9ce55ae
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/ast/src/ranged.rs b/ast/src/ranged.rs
@@ -1,7 +1,5 @@
 use crate::text_size::{TextRange, TextSize};
 
-pub use crate::builtin::*;
-
 pub trait Ranged {
     fn range(&self) -> TextRange;
 

diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_escaped_brackets.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_fstring_escaped_brackets.snap
diff --git a/parser/src/string.rs b/parser/src/string.rs
@@ -503,7 +503,11 @@ impl<'a> StringParser<'a> {
                 }
                 '\\' if !self.kind.is_raw() => {
                     self.next_char();
-                    content.push_str(&self.parse_escaped_char()?);
+                    if let Some('{' | '}') = self.peek() {
+                        content.push('\\');
+                    } else {
+                        content.push_str(&self.parse_escaped_char()?);
+                    }
                 }
                 _ => {
                     content.push(ch);
@@ -956,6 +960,13 @@ mod tests {
         insta::assert_debug_snapshot!(parse_ast);
     }
 
+    #[test]
+    fn test_parse_fstring_escaped_brackets() {
+        let source = "\\{{x\\}}";
+        let parse_ast = parse_fstring(source).unwrap();
+        insta::assert_debug_snapshot!(parse_ast);
+    }
+
     #[test]
     fn test_parse_string_concat() {
         let source = "'Hello ' 'world'";