mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-24 05:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use Stmt::parse in lieu of Suite unwraps (#5002)

Browse source
This commit is contained in:
Charlie Marsh 2023-06-10 00:55:31 -04:00 • committed by GitHub
parent 42c8054268
commit 445e1723ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/ruff_python_ast/src/helpers.rs
View file

@ -5,7 +5,6 @@ use std::path::Path;
use itertools::Itertools;
use log::error;
use num_traits::Zero;
use ruff_python_whitespace::{PythonWhitespace, UniversalNewlineIterator};
use ruff_text_size::{TextRange, TextSize};
use rustc_hash::{FxHashMap, FxHashSet};
use rustpython_parser::ast::{
@ -15,6 +14,8 @@ use rustpython_parser::ast::{
use rustpython_parser::{lexer, Mode, Tok};
use smallvec::SmallVec;
use ruff_python_whitespace::{PythonWhitespace, UniversalNewlineIterator};
use crate::call_path::CallPath;
use crate::source_code::{Indexer, Locator};
use crate::statement_visitor::{walk_body, walk_stmt, StatementVisitor};
@ -1673,11 +1674,10 @@ y = 2
#[test]
fn extract_identifier_range() -> Result<()> {
let contents = "def f(): pass".trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(4), TextSize::from(5))
);
@ -1687,29 +1687,26 @@ def \
pass
"#
.trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(8), TextSize::from(9))
);
let contents = "class Class(): pass".trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(6), TextSize::from(11))
);
let contents = "class Class: pass".trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(6), TextSize::from(11))
);
@ -1719,20 +1716,18 @@ class Class():
pass
"#
.trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(19), TextSize::from(24))
);
let contents = r#"x = y + 1"#.trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
assert_eq!(
identifier_range(stmt, &locator),
identifier_range(&stmt, &locator),
TextRange::new(TextSize::from(0), TextSize::from(9))
);
@ -1785,10 +1780,9 @@ else:
pass
"#
.trim();
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let locator = Locator::new(contents);
let range = else_range(stmt, &locator).unwrap();
let range = else_range(&stmt, &locator).unwrap();
assert_eq!(&contents[range], "else");
assert_eq!(
range,
@ -1817,9 +1811,8 @@ else:
elif b:
...
";
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::as_if_stmt(stmt).unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let stmt = Stmt::as_if_stmt(&stmt).unwrap();
let locator = Locator::new(contents);
let range = elif_else_range(stmt, &locator).unwrap();
assert_eq!(range.start(), TextSize::from(14));
@ -1830,9 +1823,8 @@ elif b:
else:
...
";
let program = Suite::parse(contents, "<filename>")?;
let stmt = program.first().unwrap();
let stmt = Stmt::as_if_stmt(stmt).unwrap();
let stmt = Stmt::parse(contents, "<filename>")?;
let stmt = Stmt::as_if_stmt(&stmt).unwrap();
let locator = Locator::new(contents);
let range = elif_else_range(stmt, &locator).unwrap();
assert_eq!(range.start(), TextSize::from(14));

12
crates/ruff_python_ast/src/source_code/generator.rs
View file

@ -1456,7 +1456,7 @@ impl<'a> Generator<'a> {
#[cfg(test)]
mod tests {
use rustpython_ast::Suite;
use rustpython_ast::Stmt;
use rustpython_parser::Parse;
use ruff_python_whitespace::LineEnding;
@ -1468,10 +1468,9 @@ mod tests {
let indentation = Indentation::default();
let quote = Quote::default();
let line_ending = LineEnding::default();
let program = Suite::parse(contents, "<filename>").unwrap();
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>").unwrap();
let mut generator = Generator::new(&indentation, quote, line_ending);
generator.unparse_stmt(stmt);
generator.unparse_stmt(&stmt);
generator.generate()
}
@ -1481,10 +1480,9 @@ mod tests {
line_ending: LineEnding,
contents: &str,
) -> String {
let program = Suite::parse(contents, "<filename>").unwrap();
let stmt = program.first().unwrap();
let stmt = Stmt::parse(contents, "<filename>").unwrap();
let mut generator = Generator::new(indentation, quote, line_ending);
generator.unparse_stmt(stmt);
generator.unparse_stmt(&stmt);
generator.generate()
}