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

Remove duplication around is_trivia functions (#11956)

Browse source 
## Summary

This PR removes the duplication around `is_trivia` functions.

There are two of them in the codebase:
1. In `pycodestyle`, it's for newline, indent, dedent, non-logical
newline and comment
2. In the parser, it's for non-logical newline and comment

The `TokenKind::is_trivia` method used (1) but that's not correct in
that context. So, this PR introduces a new `is_non_logical_token` helper
method for the `pycodestyle` crate and updates the
`TokenKind::is_trivia` implementation with (2).

This also means we can remove `Token::is_trivia` method and the
standalone `token_source::is_trivia` function and use the one on
`TokenKind`.

## Test Plan

`cargo insta test`
This commit is contained in:
Dhruv Manilawala 2024-06-21 15:32:40 +05:30 • committed by GitHub
parent 690e94f4fb
commit 4667d8697c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 41 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ruff_python_parser/src/lexer.rs
View file

@ -1626,12 +1626,6 @@ impl Token {
(self.kind, self.range)
}
/// Returns `true` if this is a trivia token.
#[inline]
pub const fn is_trivia(self) -> bool {
matches!(self.kind, TokenKind::Comment | TokenKind::NonLogicalNewline)
}
/// Returns `true` if this is any kind of string token.
const fn is_any_string(self) -> bool {
matches!(