gh-100445: Improve error message for unterminated strings with escapes

Author: hauntsaninja

Lib/test/test_syntax.py

@@ -2262,8 +2262,14 @@ def test_error_parenthesis(self):
 
     def test_error_string_literal(self):
 
-        self._check_error("'blech", "unterminated string literal")
-        self._check_error('"blech', "unterminated string literal")
+        self._check_error("'blech", r"unterminated string literal \(.*\)$")
+        self._check_error('"blech', r"unterminated string literal \(.*\)$")
+        self._check_error(
+            r'"blech\"', r"unterminated string literal \(.*\); perhaps you escaped the end quote"
+        )
+        self._check_error(
+            r'r"blech\"', r"unterminated string literal \(.*\); perhaps you escaped the end quote"
+        )
         self._check_error("'''blech", "unterminated triple-quoted string literal")
         self._check_error('"""blech', "unterminated triple-quoted string literal")
 

Misc/NEWS.d/next/Core and Builtins/2022-12-27-02-51-45.gh-issue-100445.C8f6ph.rst

@@ -0,0 +1 @@
+Improve error message for unterminated strings with escapes.

Parser/tokenizer.c

@@ -2397,6 +2397,7 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
         int quote = c;
         int quote_size = 1;             /* 1 or 3 */
         int end_quote_size = 0;
+        int has_escaped_quote = 0;
 
         /* Nodes of type STRING, especially multi line strings
            must be handled differently in order to get both
@@ -2462,8 +2463,13 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
                     return MAKE_TOKEN(ERRORTOKEN);
                 }
                 else {
-                    syntaxerror(tok, "unterminated string literal (detected at"
-                                     " line %d)", start);
+                    if (has_escaped_quote) {
+                        syntaxerror(tok, "unterminated string literal (detected at"
+                                         " line %d); perhaps you escaped the end quote?", start);
+                    } else {
+                        syntaxerror(tok, "unterminated string literal (detected at"
+                                         " line %d)", start);
+                    }
                     if (c != '\n') {
                         tok->done = E_EOLS;
                     }
@@ -2480,6 +2486,10 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
                     if (c == '\r') {
                         c = tok_nextc(tok);
                     }
+                    // but record whether the escaped char was a quote
+                    if (c == quote) {
+                        has_escaped_quote = 1;
+                    }
                 }
             }
         }