Fixed a bug that led to a false positive error when using a single-qu…

…ote form of a format string that uses a format specifier expression. This is also a bug in the Python 3.12 interpreter that is being fixed. This addresses #6077. (#6082) Co-authored-by: Eric Traut <[email protected]>
microsoft · Oct 4, 2023 · 808a348 · 808a348
1 parent b7bbbd6
commit 808a348
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/pyright-internal/src/parser/tokenizer.ts b/packages/pyright-internal/src/parser/tokenizer.ts
@@ -1631,7 +1631,7 @@ export class Tokenizer<KeywordT extends number> {
                     }
                 }
             } else if (this._cs.currentChar === Char.LineFeed || this._cs.currentChar === Char.CarriageReturn) {
-                if (!isTriplicate) {
+                if (!isTriplicate && !isFString) {
                     // Unterminated single-line string
                     flags |= StringTokenFlags.Unterminated;
                     return { escapedValue: String.fromCharCode.apply(undefined, escapedValueParts), flags };

diff --git a/packages/pyright-internal/src/tests/samples/fstring1.py b/packages/pyright-internal/src/tests/samples/fstring1.py
@@ -146,3 +146,9 @@ def func1(x):
 
 v2 = f'x \
 y'
+
+w1 = 1
+
+w2 = f"__{
+    w1:d
+}__"