mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-22 08:12:17 +00:00
0115fd3757
Some checks are pending
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / Determine changes (push) Waiting to run
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (macos) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / ty completion evaluation (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / check playground (push) Blocked by required conditions
CI / benchmarks instrumented (ruff) (push) Blocked by required conditions
CI / benchmarks instrumented (ty) (push) Blocked by required conditions
CI / benchmarks walltime (medium|multithreaded) (push) Blocked by required conditions
CI / benchmarks walltime (small|large) (push) Blocked by required conditions
[ty Playground] Release / publish (push) Waiting to run
## Summary
Fixes #20774 by tracking whether an `InterpolatedStringState` element is
nested inside of another interpolated element. This feels like kind of a
naive fix, so I'm welcome to other ideas. But it resolves the problem in
the issue and clears up the syntax error in the black compatibility
test, without affecting many other cases.
The other affected case is actually interesting too because the
[input](
|
||
|---|---|---|
| .. | ||
| black_compatibility@cases__allow_empty_first_line.py.snap | ||
| black_compatibility@cases__backslash_before_indent.py.snap | ||
| black_compatibility@cases__cantfit.py.snap | ||
| black_compatibility@cases__class_blank_parentheses.py.snap | ||
| black_compatibility@cases__comment_after_escaped_newline.py.snap | ||
| black_compatibility@cases__comments2.py.snap | ||
| black_compatibility@cases__comments6.py.snap | ||
| black_compatibility@cases__comments9.py.snap | ||
| black_compatibility@cases__comments_in_blocks.py.snap | ||
| black_compatibility@cases__comments_in_double_parens.py.snap | ||
| black_compatibility@cases__composition.py.snap | ||
| black_compatibility@cases__composition_no_trailing_comma.py.snap | ||
| black_compatibility@cases__conditional_expression.py.snap | ||
| black_compatibility@cases__docstring_no_string_normalization.py.snap | ||
| black_compatibility@cases__dummy_implementations.py.snap | ||
| black_compatibility@cases__empty_lines.py.snap | ||
| black_compatibility@cases__expression.py.snap | ||
| black_compatibility@cases__f_docstring.py.snap | ||
| black_compatibility@cases__fmtonoff.py.snap | ||
| black_compatibility@cases__fmtonoff4.py.snap | ||
| black_compatibility@cases__fmtonoff5.py.snap | ||
| black_compatibility@cases__fmtpass_imports.py.snap | ||
| black_compatibility@cases__fmtskip5.py.snap | ||
| black_compatibility@cases__fmtskip9.py.snap | ||
| black_compatibility@cases__fmtskip10.py.snap | ||
| black_compatibility@cases__form_feeds.py.snap | ||
| black_compatibility@cases__fstring.py.snap | ||
| black_compatibility@cases__fstring_quotations.py.snap | ||
| black_compatibility@cases__funcdef_return_type_trailing_comma.py.snap | ||
| black_compatibility@cases__function.py.snap | ||
| black_compatibility@cases__function2.py.snap | ||
| black_compatibility@cases__function_trailing_comma.py.snap | ||
| black_compatibility@cases__generics_wrapping.py.snap | ||
| black_compatibility@cases__ignore_pyi.pyi.snap | ||
| black_compatibility@cases__keep_newline_after_match.py.snap | ||
| black_compatibility@cases__line_ranges_diff_edge_case.py.snap | ||
| black_compatibility@cases__line_ranges_fmt_off_decorator.py.snap | ||
| black_compatibility@cases__long_strings__type_annotations.py.snap | ||
| black_compatibility@cases__long_strings_flag_disabled.py.snap | ||
| black_compatibility@cases__multiline_consecutive_open_parentheses_ignore.py.snap | ||
| black_compatibility@cases__nested_stub.pyi.snap | ||
| black_compatibility@cases__pattern_matching_style.py.snap | ||
| black_compatibility@cases__pattern_matching_trailing_comma.py.snap | ||
| black_compatibility@cases__pattern_matching_with_if_stmt.py.snap | ||
| black_compatibility@cases__pep604_union_types_line_breaks.py.snap | ||
| black_compatibility@cases__pep_572_remove_parens.py.snap | ||
| black_compatibility@cases__pep_701.py.snap | ||
| black_compatibility@cases__prefer_rhs_split.py.snap | ||
| black_compatibility@cases__prefer_rhs_split_reformatted.py.snap | ||
| black_compatibility@cases__preview_cantfit.py.snap | ||
| black_compatibility@cases__preview_cantfit_string.py.snap | ||
| black_compatibility@cases__preview_comments7.py.snap | ||
| black_compatibility@cases__preview_hug_parens_with_braces_and_square_brackets.py.snap | ||
| black_compatibility@cases__preview_hug_parens_with_braces_and_square_brackets_no_ll1.py.snap | ||
| black_compatibility@cases__preview_import_line_collapse.py.snap | ||
| black_compatibility@cases__preview_long_dict_values.py.snap | ||
| black_compatibility@cases__preview_long_strings.py.snap | ||
| black_compatibility@cases__preview_long_strings__east_asian_width.py.snap | ||
| black_compatibility@cases__preview_long_strings__edge_case.py.snap | ||
| black_compatibility@cases__preview_long_strings__regression.py.snap | ||
| black_compatibility@cases__preview_long_strings__type_annotations.py.snap | ||
| black_compatibility@cases__preview_multiline_strings.py.snap | ||
| black_compatibility@cases__preview_remove_multiline_lone_list_item_parens.py.snap | ||
| black_compatibility@cases__preview_return_annotation_brackets_string.py.snap | ||
| black_compatibility@cases__preview_wrap_comprehension_in.py.snap | ||
| black_compatibility@cases__raw_docstring.py.snap | ||
| black_compatibility@cases__raw_docstring_no_string_normalization.py.snap | ||
| black_compatibility@cases__remove_await_parens.py.snap | ||
| black_compatibility@cases__remove_except_parens.py.snap | ||
| black_compatibility@cases__remove_for_brackets.py.snap | ||
| black_compatibility@cases__remove_lone_list_item_parens.py.snap | ||
| black_compatibility@cases__remove_newline_after_code_block_open.py.snap | ||
| black_compatibility@cases__remove_redundant_parens_in_case_guard.py.snap | ||
| black_compatibility@cases__return_annotation_brackets.py.snap | ||
| black_compatibility@cases__single_line_format_skip_with_multiple_comments.py.snap | ||
| black_compatibility@cases__stub.pyi.snap | ||
| black_compatibility@cases__torture.py.snap | ||
| black_compatibility@cases__trailing_commas_in_leading_parts.py.snap | ||
| black_compatibility@cases__tupleassign.py.snap | ||
| black_compatibility@cases__type_param_defaults.py.snap | ||
| black_compatibility@miscellaneous__blackd_diff.py.snap | ||
| black_compatibility@miscellaneous__debug_visitor.py.snap | ||
| black_compatibility@miscellaneous__string_quotes.py.snap | ||
| format@blank_line_before_class_docstring.py.snap | ||
| format@carriage_return__string.py.snap | ||
| format@docstring.py.snap | ||
| format@docstring_chaperones.py.snap | ||
| format@docstring_code_examples.py.snap | ||
| format@docstring_code_examples_crlf.py.snap | ||
| format@docstring_code_examples_dynamic_line_width.py.snap | ||
| format@docstring_newlines.py.snap | ||
| format@docstring_non_visible_characters.py.snap | ||
| format@docstring_tab_indentation.py.snap | ||
| format@empty_multiple_trailing_newlines.py.snap | ||
| format@empty_now_newline.py.snap | ||
| format@empty_trailing_newline.py.snap | ||
| format@empty_whitespace.py.snap | ||
| format@expression__annotated_assign.py.snap | ||
| format@expression__attribute.py.snap | ||
| format@expression__await.py.snap | ||
| format@expression__binary.py.snap | ||
| format@expression__binary_implicit_string.py.snap | ||
| format@expression__binary_pow_spacing.py.snap | ||
| format@expression__boolean_operation.py.snap | ||
| format@expression__bytes.py.snap | ||
| format@expression__call.py.snap | ||
| format@expression__compare.py.snap | ||
| format@expression__dict.py.snap | ||
| format@expression__dict_comp.py.snap | ||
| format@expression__fstring.py.snap | ||
| format@expression__fstring_preview.py.snap | ||
| format@expression__generator_exp.py.snap | ||
| format@expression__hug.py.snap | ||
| format@expression__if.py.snap | ||
| format@expression__join_implicit_concatenated_string.py.snap | ||
| format@expression__join_implicit_concatenated_string_assignment.py.snap | ||
| format@expression__join_implicit_concatenated_string_preserve.py.snap | ||
| format@expression__lambda.py.snap | ||
| format@expression__list.py.snap | ||
| format@expression__list_comp.py.snap | ||
| format@expression__named_expr.py.snap | ||
| format@expression__number.py.snap | ||
| format@expression__optional_parentheses_comments.py.snap | ||
| format@expression__set_comp.py.snap | ||
| format@expression__slice.py.snap | ||
| format@expression__split_empty_brackets.py.snap | ||
| format@expression__starred.py.snap | ||
| format@expression__string.py.snap | ||
| format@expression__subscript.py.snap | ||
| format@expression__tstring.py.snap | ||
| format@expression__tuple.py.snap | ||
| format@expression__unary.py.snap | ||
| format@expression__unsplittable.py.snap | ||
| format@expression__yield.py.snap | ||
| format@expression__yield_from.py.snap | ||
| format@f-string-carriage-return-newline.py.snap | ||
| format@fmt_on_off__comments.py.snap | ||
| format@fmt_on_off__empty_file.py.snap | ||
| format@fmt_on_off__fmt_off_docstring.py.snap | ||
| format@fmt_on_off__fmt_off_unclosed_deep_nested_trailing_comment.py.snap | ||
| format@fmt_on_off__fmt_off_unclosed_trailing_comment.py.snap | ||
| format@fmt_on_off__form_feed.py.snap | ||
| format@fmt_on_off__indent.py.snap | ||
| format@fmt_on_off__last_statement.py.snap | ||
| format@fmt_on_off__mixed_space_and_tab.py.snap | ||
| format@fmt_on_off__newlines.py.snap | ||
| format@fmt_on_off__no_fmt_on.py.snap | ||
| format@fmt_on_off__off_on_off_on.py.snap | ||
| format@fmt_on_off__simple.py.snap | ||
| format@fmt_on_off__trailing_comments.py.snap | ||
| format@fmt_on_off__trailing_semicolon.py.snap | ||
| format@fmt_on_off__yapf.py.snap | ||
| format@fmt_skip__decorators.py.snap | ||
| format@fmt_skip__docstrings.py.snap | ||
| format@fmt_skip__match.py.snap | ||
| format@fmt_skip__or_else.py.snap | ||
| format@fmt_skip__parentheses.py.snap | ||
| format@fmt_skip__reason.py.snap | ||
| format@fmt_skip__trailing_semi.py.snap | ||
| format@fmt_skip__type_params.py.snap | ||
| format@form_feed.py.snap | ||
| format@module_dangling_comment1.py.snap | ||
| format@module_dangling_comment2.py.snap | ||
| format@multiline_string_deviations.py.snap | ||
| format@newlines.py.snap | ||
| format@newlines.pyi.snap | ||
| format@notebook_docstring.py.snap | ||
| format@parentheses__call_chains.py.snap | ||
| format@parentheses__expression_parentheses_comments.py.snap | ||
| format@parentheses__nested.py.snap | ||
| format@parentheses__opening_parentheses_comment_empty.py.snap | ||
| format@parentheses__opening_parentheses_comment_value.py.snap | ||
| format@pattern__pattern_maybe_parenthesize.py.snap | ||
| format@pattern_match_regression_brackets.py.snap | ||
| format@preview.py.snap | ||
| format@quote_style.py.snap | ||
| format@range_formatting__ancestory.py.snap | ||
| format@range_formatting__clause_header.py.snap | ||
| format@range_formatting__comment_only_range.py.snap | ||
| format@range_formatting__decorators.py.snap | ||
| format@range_formatting__docstring_code_examples.py.snap | ||
| format@range_formatting__empty_file.py.snap | ||
| format@range_formatting__empty_range.py.snap | ||
| format@range_formatting__end_of_file.py.snap | ||
| format@range_formatting__fmt_on_off.py.snap | ||
| format@range_formatting__indent.py.snap | ||
| format@range_formatting__leading_comments.py.snap | ||
| format@range_formatting__leading_trailing_comments.py.snap | ||
| format@range_formatting__module.py.snap | ||
| format@range_formatting__parentheses.py.snap | ||
| format@range_formatting__range_narrowing.py.snap | ||
| format@range_formatting__regressions.py.snap | ||
| format@range_formatting__same_line_body.py.snap | ||
| format@range_formatting__stub.pyi.snap | ||
| format@range_formatting__trailing_comments.py.snap | ||
| format@range_formatting__whitespace_only_range.py.snap | ||
| format@skip_magic_trailing_comma.py.snap | ||
| format@statement__ann_assign.py.snap | ||
| format@statement__assert.py.snap | ||
| format@statement__assign.py.snap | ||
| format@statement__assignment_split_value_first.py.snap | ||
| format@statement__aug_assign.py.snap | ||
| format@statement__break.py.snap | ||
| format@statement__class_definition.py.snap | ||
| format@statement__delete.py.snap | ||
| format@statement__ellipsis.pyi.snap | ||
| format@statement__for.py.snap | ||
| format@statement__function.py.snap | ||
| format@statement__global.py.snap | ||
| format@statement__if.py.snap | ||
| format@statement__import.py.snap | ||
| format@statement__import_from.py.snap | ||
| format@statement__long_type_annotations.py.snap | ||
| format@statement__match.py.snap | ||
| format@statement__module_comment.py.snap | ||
| format@statement__nonlocal.py.snap | ||
| format@statement__raise.py.snap | ||
| format@statement__return.py.snap | ||
| format@statement__return_annotation.py.snap | ||
| format@statement__return_type_no_parameters.py.snap | ||
| format@statement__return_type_parameters.py.snap | ||
| format@statement__stub_functions_trailing_comments.py.snap | ||
| format@statement__top_level.py.snap | ||
| format@statement__top_level.pyi.snap | ||
| format@statement__try.py.snap | ||
| format@statement__type_alias.py.snap | ||
| format@statement__while.py.snap | ||
| format@statement__with.py.snap | ||
| format@statement__with_39.py.snap | ||
| format@stub_files__blank_line_after_nested_stub_class.pyi.snap | ||
| format@stub_files__blank_line_after_nested_stub_class_eof.pyi.snap | ||
| format@stub_files__comments.pyi.snap | ||
| format@stub_files__decorated_class_after_function.pyi.snap | ||
| format@stub_files__nesting.pyi.snap | ||
| format@stub_files__suite.pyi.snap | ||
| format@stub_files__top_level.pyi.snap | ||
| format@tab_width.py.snap | ||
| format@trailing_comments.py.snap | ||
| format@trivia.py.snap | ||