mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-22 11:24:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement Ranged on more structs (#6921)

Browse source 
Now that it's in `ruff_text_size`, we can use it in a few places that we
couldn't before.
This commit is contained in:
Charlie Marsh 2023-08-27 15:03:08 -04:00 • committed by GitHub
parent fc89976c24
commit 059757a8c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 104 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ruff_python_formatter/src/comments/placement.rs
View file

@ -434,7 +434,7 @@ fn handle_own_line_comment_around_body<'a>(
// ```
let maybe_token = SimpleTokenizer::new(
locator.contents(),
TextRange::new(preceding.end(), comment.slice().start()),
TextRange::new(preceding.end(), comment.start()),
)
.skip_trivia()
.next();
@ -475,7 +475,7 @@ fn handle_own_line_comment_between_branches<'a>(
// It depends on the indentation level of the comment if it is a leading comment for the
// following branch or if it a trailing comment of the previous body's last statement.
let comment_indentation = indentation_at_offset(comment.slice().start(), locator)
let comment_indentation = indentation_at_offset(comment.start(), locator)
.unwrap_or_default()
.len();
@ -559,7 +559,7 @@ fn handle_own_line_comment_after_branch<'a>(
// We only care about the length because indentations with mixed spaces and tabs are only valid if
// the indent-level doesn't depend on the tab width (the indent level must be the same if the tab width is 1 or 8).
let comment_indentation = indentation_at_offset(comment.slice().start(), locator)
let comment_indentation = indentation_at_offset(comment.start(), locator)
.unwrap_or_default()
.len();
@ -848,7 +848,7 @@ fn handle_slice_comments<'a>(
// Check for `foo[ # comment`, but only if they are on the same line
let after_lbracket = matches!(
SimpleTokenizer::up_to_without_back_comment(comment.slice().start(), locator.contents())
SimpleTokenizer::up_to_without_back_comment(comment.start(), locator.contents())
.skip_trivia()
.next_back(),
Some(SimpleToken {
@ -881,7 +881,7 @@ fn handle_slice_comments<'a>(
};
if let Some(node) = node {
if comment.slice().start() < node.start() {
if comment.start() < node.start() {
CommentPlacement::leading(node.as_ref(), comment)
} else {
// If a trailing comment is an end of line comment that's fine because we have a node
@ -977,7 +977,7 @@ fn handle_dict_unpacking_comment<'a>(
};
let mut tokens = SimpleTokenizer::new(
locator.contents(),
TextRange::new(preceding_end, comment.slice().start()),
TextRange::new(preceding_end, comment.start()),
)
.skip_trivia()
.skip_while(|token| token.kind == SimpleTokenKind::RParen);
@ -1138,7 +1138,7 @@ fn handle_expr_if_comment<'a>(
locator.contents(),
);
// Between `if` and `test`
if if_token.range.start() < comment.slice().start() && comment.slice().start() < test.start() {
if if_token.start() < comment.start() && comment.start() < test.start() {
return CommentPlacement::leading(test.as_ref(), comment);
}
@ -1148,9 +1148,7 @@ fn handle_expr_if_comment<'a>(
locator.contents(),
);
// Between `else` and `orelse`
if else_token.range.start() < comment.slice().start()
&& comment.slice().start() < orelse.start()
{
if else_token.start() < comment.start() && comment.start() < orelse.start() {
return CommentPlacement::leading(orelse.as_ref(), comment);
}
@ -1585,7 +1583,7 @@ fn handle_comprehension_comment<'a>(
// in c
// ]
// ```
if comment.slice().start() < in_token.start() {
if comment.start() < in_token.start() {
// attach as dangling comments on the target
// (to be rendered as leading on the "in")
return if is_own_line {
@ -1604,7 +1602,7 @@ fn handle_comprehension_comment<'a>(
// c
// ]
// ```
if comment.slice().start() < comprehension.iter.start() {
if comment.start() < comprehension.iter.start() {
return if is_own_line {
CommentPlacement::Default(comment)
} else {
@ -1639,12 +1637,10 @@ fn handle_comprehension_comment<'a>(
locator.contents(),
);
if is_own_line {
if last_end < comment.slice().start() && comment.slice().start() < if_token.start() {
if last_end < comment.start() && comment.start() < if_token.start() {
return CommentPlacement::dangling(if_node, comment);
}
} else if if_token.start() < comment.slice().start()
&& comment.slice().start() < if_node.start()
{
} else if if_token.start() < comment.start() && comment.start() < if_node.start() {
return CommentPlacement::dangling(if_node, comment);
}
last_end = if_node.end();