mirror of https://github.com/astral-sh/ruff
008bbfdf5a
As of [this cpython PR](https://github.com/python/cpython/pull/135996), it is not allowed to concatenate t-strings with non-t-strings, implicitly or explicitly. Expressions such as `"foo" t"{bar}"` are now syntax errors. This PR updates some AST nodes and parsing to reflect this change. The structural change is that `TStringPart` is no longer needed, since, as in the case of `BytesStringLiteral`, the only possibilities are that we have a single `TString` or a vector of such (representing an implicit concatenation of t-strings). This removes a level of nesting from many AST expressions (which is what all the snapshot changes reflect), and simplifies some logic in the implementation of visitors, for example. The other change of note is in the parser. When we meet an implicit concatenation of string-like literals, we now count the number of t-string literals. If these do not exhaust the total number of implicitly concatenated pieces, then we emit a syntax error. To recover from this syntax error, we encode any t-string pieces as _invalid_ string literals (which means we flag them as invalid, record their range, and record the value as `""`). Note that if at least one of the pieces is an f-string we prefer to parse the entire string as an f-string; otherwise we parse it as a string. This logic is exactly the same as how we currently treat `BytesStringLiteral` parsing and error recovery - and carries with it the same pros and cons. Finally, note that I have not implemented any changes in the implementation of the formatter. As far as I can tell, none are needed. I did change a few of the fixtures so that we are always concatenating t-strings with t-strings. |
||
|---|---|---|
| .. | ||
| source_order__bytes_literals.snap | ||
| source_order__class_type_parameters.snap | ||
| source_order__compare.snap | ||
| source_order__decorators.snap | ||
| source_order__dict_comprehension.snap | ||
| source_order__f_strings.snap | ||
| source_order__function_arguments.snap | ||
| source_order__function_positional_only_with_default.snap | ||
| source_order__function_type_parameters.snap | ||
| source_order__list_comprehension.snap | ||
| source_order__match_class_pattern.snap | ||
| source_order__set_comprehension.snap | ||
| source_order__string_literals.snap | ||
| source_order__t_strings.snap | ||
| source_order__type_aliases.snap | ||
| visitor__bytes_literals.snap | ||
| visitor__class_type_parameters.snap | ||
| visitor__compare.snap | ||
| visitor__decorators.snap | ||
| visitor__dict_comprehension.snap | ||
| visitor__f_strings.snap | ||
| visitor__function_arguments.snap | ||
| visitor__function_positional_only_with_default.snap | ||
| visitor__function_type_parameters.snap | ||
| visitor__list_comprehension.snap | ||
| visitor__match_class_pattern.snap | ||
| visitor__set_comprehension.snap | ||
| visitor__string_literals.snap | ||
| visitor__t_strings.snap | ||
| visitor__type_aliases.snap | ||