Fix W391 fixes for consecutive empty notebook cells#24236
Merged
charliermarsh merged 2 commits intomainfrom Mar 27, 2026
Merged
Fix W391 fixes for consecutive empty notebook cells#24236charliermarsh merged 2 commits intomainfrom
charliermarsh merged 2 commits intomainfrom
Conversation
188aef0 to
b0f2383
Compare
|
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| W391 | 2 | 0 | 2 | 0 | 0 |
Member
Author
|
I believe those diagnostics were false positives. |
MichaReiser
approved these changes
Mar 27, 2026
crates/ruff_notebook/src/cell.rs
Outdated
| self.ranges().map(|range| { | ||
| let end = range | ||
| .end() | ||
| .checked_sub(TextSize::new(1)) |
Member
There was a problem hiding this comment.
Is it guaranteed that this last character always has a UTF8 length of 1?
| .for_each(drop); | ||
|
|
||
| for range in cell_offsets.content_ranges() { | ||
| let mut tokens_iter = tokens.in_range(range).iter().rev().peekable(); |
Member
There was a problem hiding this comment.
Nit: Using in_range performs a binary search. We should be able to do better by doing the slicing ourselves (with a linear scan to find the cell end).
b0f2383 to
bc8d1a7
Compare
carljm
added a commit
that referenced
this pull request
Mar 31, 2026
* main: (40 commits) [ty] resolve union-likes in emitting union attribute errors (#24263) [ty] Improve support for `Callable` type context (#23888) [ty] Propagate type context through `await` expressions (#24256) [`pyflakes`] Flag annotated variable redeclarations as `F811` in preview mode (#24244) [ty] Preserve `Divergent` when materializing recursive aliases (#24245) Fix W391 fixes for consecutive empty notebook cells (#24236) [flake8-bugbear] Clarify RUF071 fix safety for non-path string comparisons (#24149) [ty] Ban type qualifiers in PEP-695 type aliases (#24242) [ty] Include keyword-prefixed symbols in completions for attributes (#24232) [ty] Add tests for TypedDict method overloads on unions (#24230) [ty] report unused bindings as unnecessary hint diagnostics (#23305) Remove unused `non_root` variable (#24238) Extend F507 to flag %-format strings with zero placeholders (#24215) [`flake8-simplify`] Suppress `SIM105` for `except*` before Python 3.12 (#23869) Ignore pre-initialization references in SIM113 (#24235) Parenthesize expression in RUF050 fix (#24234) Publish playgrounds using the `release-playground` environment (#24223) [ty] Fix instance-attribute lookup in methods of protocol classes (#24213) [ty] Used shared expression cache during generic call inference (#24219) [ty] make `Type::BoundMethod` include instances of same-named methods bound to a subclass (#24039) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
We now compute trailing newline diagnostics per-cell instead of across the concatenated file, which avoids panics for consecutive empty code cells.
Closes #22797.
Closes #20789.