Python/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff synced 2026-01-11 00:24:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SimpleTokenizer's backward lexing of # (#5878)

Browse Source
This commit is contained in:
Micha Reiser
2023-07-20 11:54:18 +02:00
committed by GitHub
parent 8c5f8a8aef
commit 76e9ce6dc0
13 changed files with 1863 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/ruff_python_formatter/src/comments/placement.rs
View File

@@ -8,8 +8,7 @@ use ruff_python_ast::node::{AnyNodeRef, AstNode};
use ruff_python_ast::source_code::Locator;
use ruff_python_ast::whitespace;
use ruff_python_trivia::{
first_non_trivia_token_rev, PythonWhitespace, SimpleToken, SimpleTokenKind, SimpleTokenizer,
UniversalNewlines,
PythonWhitespace, SimpleToken, SimpleTokenKind, SimpleTokenizer, UniversalNewlines,
};
use crate::comments::visitor::{CommentPlacement, DecoratedComment};
@@ -1059,7 +1058,9 @@ fn handle_slice_comments<'a>(
// Check for `foo[ # comment`, but only if they are on the same line
let after_lbracket = matches!(
first_non_trivia_token_rev(comment.slice().start(), locator.contents()),
SimpleTokenizer::up_to_without_back_comment(comment.slice().start(), locator.contents())
.skip_trivia()
.next_back(),
Some(SimpleToken {
kind: SimpleTokenKind::LBracket,
..