language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-03 17:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Consider binary expr for parenthesized with items parsing (#11012)

Browse source 
## Summary

This PR fixes the bug in with items parsing where it would fail to
recognize that the parenthesized expression is part of a large binary
expression.

## Test Plan

Add test cases and verified the snapshots.
This commit is contained in:
Dhruv Manilawala 2024-04-18 21:39:30 +05:30 • committed by GitHub
parent 6c4d779140
commit b7066e64e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 417 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ruff_python_parser/src/parser/statement.rs
View file

@ -17,7 +17,7 @@ use crate::parser::{
use crate::token_set::TokenSet;
use crate::{Mode, ParseErrorType, Tok, TokenKind};
use super::expression::{AllowNamedExpression, AllowStarredExpression};
use super::expression::{AllowNamedExpression, AllowStarredExpression, Precedence};
use super::Parenthesized;
/// Tokens that represent compound statements.
@ -2147,15 +2147,31 @@ impl<'src> Parser<'src> {
// expressions.
lhs = self.parse_postfix_expression(lhs, start);
// test_ok ambiguous_lpar_with_items_if_expr
// with (x) if True else y: ...
// with (x for x in iter) if True else y: ...
// with (x async for x in iter) if True else y: ...
// with (x)[0] if True else y: ...
let context_expr = if self.at(TokenKind::If) {
// test_ok ambiguous_lpar_with_items_if_expr
// with (x) if True else y: ...
// with (x for x in iter) if True else y: ...
// with (x async for x in iter) if True else y: ...
// with (x)[0] if True else y: ...
Expr::If(self.parse_if_expression(lhs, start))
} else {
lhs
// test_ok ambiguous_lpar_with_items_binary_expr
// # It doesn't matter what's inside the parentheses, these tests need to make sure
// # all binary expressions parses correctly.
// with (a) and b: ...
// with (a) is not b: ...
// # Make sure precedence works
// with (a) or b and c: ...
// with (a) and b or c: ...
// with (a | b) << c | d: ...
// # Postfix should still be parsed first
// with (a)[0] + b * c: ...
self.parse_expression_with_precedence_recursive(
lhs.into(),
Precedence::Initial,
start,
)
.expr
};
let optional_vars = self