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

Refactor range from Attributed to Nodes (#4422)

Browse source
This commit is contained in:
Micha Reiser 2023-05-16 08:36:32 +02:00 • committed by GitHub
parent 140e0acf54
commit fa26860296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
330 changed files with 4816 additions and 3946 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ruff_python_semantic/src/analyze/branch_detection.rs
View file

@ -1,6 +1,6 @@
use std::cmp::Ordering;
use rustpython_parser::ast::{self, ExcepthandlerKind, Stmt, StmtKind};
use rustpython_parser::ast::{self, Excepthandler, Stmt};
use crate::node::{NodeId, Nodes};
@ -41,15 +41,15 @@ fn common_ancestor(
/// Return the alternative branches for a given node.
fn alternatives(stmt: &Stmt) -> Vec<Vec<&Stmt>> {
match &stmt.node {
StmtKind::If(ast::StmtIf { body, .. }) => vec![body.iter().collect()],
StmtKind::Try(ast::StmtTry {
match stmt {
Stmt::If(ast::StmtIf { body, .. }) => vec![body.iter().collect()],
Stmt::Try(ast::StmtTry {
body,
handlers,
orelse,
..
})
| StmtKind::TryStar(ast::StmtTryStar {
| Stmt::TryStar(ast::StmtTryStar {
body,
handlers,
orelse,
@ -57,13 +57,12 @@ fn alternatives(stmt: &Stmt) -> Vec<Vec<&Stmt>> {
}) => vec![body.iter().chain(orelse.iter()).collect()]
.into_iter()
.chain(handlers.iter().map(|handler| {
let ExcepthandlerKind::ExceptHandler(ast::ExcepthandlerExceptHandler {
body, ..
}) = &handler.node;
let Excepthandler::ExceptHandler(ast::ExcepthandlerExceptHandler { body, .. }) =
handler;
body.iter().collect()
}))
.collect(),
StmtKind::Match(ast::StmtMatch { cases, .. }) => cases
Stmt::Match(ast::StmtMatch { cases, .. }) => cases
.iter()
.map(|case| case.body.iter().collect())
.collect(),