Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pygrep_hooks] Fix blanket-noqa panic when last line has noqa with no newline (PGH004) #11108

Merged
merged 3 commits into from
Apr 25, 2024
Merged

[pygrep_hooks] Fix blanket-noqa panic when last line has noqa with no newline (PGH004) #11108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6f8e72
fix bug
augustelalande Apr 23, 2024
b1f451e
improve handling of EOF in noqa
augustelalande Apr 24, 2024
081426f
make `include_line_end` a `NoqaDirectiveLine` attribute
augustelalande Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH004_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#noqa
1 change: 1 addition & 0 deletions crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mod tests {
#[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_0.py"))]
#[test_case(Rule::BlanketTypeIgnore, Path::new("PGH003_1.py"))]
#[test_case(Rule::BlanketNOQA, Path::new("PGH004_0.py"))]
#[test_case(Rule::BlanketNOQA, Path::new("PGH004_1.py"))]
#[test_case(Rule::InvalidMockAccess, Path::new("PGH005_0.py"))]
fn rules(rule_code: Rule, path: &Path) -> Result<()> {
let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
Expand Down
11 changes: 8 additions & 3 deletions crates/ruff_linter/src/rules/pygrep_hooks/rules/blanket_noqa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation};
use ruff_macros::{derive_message_formats, violation};
use ruff_python_trivia::Cursor;
use ruff_source_file::Locator;
use ruff_text_size::{Ranged, TextRange};
use ruff_text_size::{Ranged, TextLen, TextRange};

use crate::noqa::{Directive, NoqaDirectives};

Expand Down Expand Up @@ -88,8 +88,13 @@ pub(crate) fn blanket_noqa(
) {
for directive_line in noqa_directives.lines() {
if let Directive::All(all) = &directive_line.directive {
let line = locator.slice(directive_line.range);
let offset = directive_line.range.start();
let line = if directive_line.end() > locator.contents().text_len() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a bug, if the .end() is greater than the contents... Have you looked into how that happens?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the PR summary, but what happens if we remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya it generates a fixture failure with W292_1.py

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the code mentioned in the PR summary was added by @MichaReiser so maybe he can shed some light.

let range = TextRange::new(directive_line.start(), locator.contents().text_len());
locator.slice(range)
} else {
locator.slice(directive_line)
};
let offset = directive_line.start();
let noqa_end = all.end() - offset;

// Skip the `# noqa`, plus any trailing whitespace.
Expand Down
8 changes: 8 additions & 0 deletions ...s/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_1.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
source: crates/ruff_linter/src/rules/pygrep_hooks/mod.rs
---
PGH004_1.py:1:1: PGH004 Use specific rule codes when using `noqa`
|
1 | #noqa
| ^^^^^ PGH004
|
Loading