mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-27 12:29:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid depth counting when detecting indentation (#11947)

Browse source 
## Summary

This PR avoids the `depth` counter when detecting indentation from
non-logical lines because it seems to never be used. It might have been
a leftover when the logic was added originally in #11608.

## Test Plan

`cargo insta test`
This commit is contained in:
Dhruv Manilawala 2024-06-20 10:42:35 +05:30 • committed by GitHub
parent b617d90651
commit a26bd01be2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ruff_python_codegen/src/stylist.rs
View file

@ -97,26 +97,16 @@ fn detect_indention(tokens: &[Token], locator: &Locator) -> Indentation {
// cos, // cos,
// ) // )
// ``` // ```
let mut depth = 0usize;
for token in tokens { for token in tokens {
match token.kind() { if token.kind() == TokenKind::NonLogicalNewline {
TokenKind::Lpar | TokenKind::Lbrace | TokenKind::Lsqb => { let line = locator.line(token.end());
depth = depth.saturating_add(1); let indent_index = line.find(|c: char| !c.is_whitespace());
} if let Some(indent_index) = indent_index {
TokenKind::Rpar | TokenKind::Rbrace | TokenKind::Rsqb => { if indent_index > 0 {
depth = depth.saturating_sub(1); let whitespace = &line[..indent_index];
} return Indentation(whitespace.to_string());
TokenKind::NonLogicalNewline => {
let line = locator.line(token.end());
let indent_index = line.find(|c: char| !c.is_whitespace());
if let Some(indent_index) = indent_index {
if indent_index > 0 {
let whitespace = &line[..indent_index];
return Indentation(whitespace.to_string());
}
} }
} }
_ => {}
} }
} }