Skip to content

Fix renumbering across blank lines#118

Merged
leynos merged 3 commits intomainfrom
codex/investigate-renumber-feature-issue
Jul 21, 2025
Merged

Fix renumbering across blank lines#118
leynos merged 3 commits intomainfrom
codex/investigate-renumber-feature-issue

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 21, 2025

Summary

  • ignore blank lines when renumbering ordered lists
  • document that blank lines do not interrupt list numbering
  • add regression test demonstrating renumbering with blank lines

Testing

  • make fmt
  • make lint
  • make test

https://chatgpt.com/codex/tasks/task_e_687ea87e7b748322b9eae5cc77a29507

Summary by Sourcery

Ignore blank lines when renumbering ordered lists to maintain continuous numbering across blank lines, update documentation accordingly, and add regression tests

Bug Fixes:

  • Skip blank lines when renumbering ordered lists to preserve correct numbering across blank lines

Documentation:

  • Document that blank lines no longer interrupt list numbering

Tests:

  • Add regression test and test data for renumbering lists with blank lines

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Jul 21, 2025

Reviewer's Guide

renumber_lists now treats blank lines as transparent to ordered list numbering, the documentation has been updated accordingly, and a new regression test verifies renumbering across blank lines.

Class diagram for renumber_lists function update

classDiagram
    class renumber_lists {
        +renumber_lists(lines: &[String]) -> Vec<String>
    }
    renumber_lists : +Ignores blank lines when renumbering
    renumber_lists : +Maintains numbering across blank lines
Loading

File-Level Changes

Change Details Files
Ignore blank lines during list renumbering
  • Added a check for empty lines in renumber_lists
  • Push blank lines directly to output and mark prev_blank
  • Skip the numbered-item logic when encountering blank lines
src/lists.rs
Add regression test for renumbering across blank lines
  • Inserted a blank_lines test case in the renumber suite
  • Created input and expected output files demonstrating blank-line behavior
tests/lists.rs
tests/data/renumber_blank_lines_input.txt
tests/data/renumber_blank_lines_expected.txt
Document that blank lines do not interrupt list numbering
  • Updated README.md to note blank lines are ignored in ordered lists
README.md

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 21, 2025

Summary by CodeRabbit

  • Documentation
    • Clarified that blank lines between list items do not interrupt ordered list renumbering in the command-line usage section.
  • Bug Fixes
    • Improved handling of blank lines in ordered lists to ensure numbering continues uninterrupted across gaps.
  • Tests
    • Added new test cases and supporting data to verify correct renumbering of ordered lists with blank lines.

Walkthrough

Update the renumber_lists function to explicitly handle blank lines, ensuring they are preserved and do not interrupt ordered list renumbering. Add corresponding test data and a new test case to validate this behaviour. Clarify the --renumber documentation to state that blank lines are ignored during renumbering.

Changes

File(s) Change Summary
README.md Updated documentation for --renumber to clarify blank lines are ignored during list renumbering.
src/lists.rs Added explicit handling for blank lines in renumber_lists, preserving them and updating state.
tests/data/renumber_blank_lines_input.txt
tests/data/renumber_blank_lines_expected.txt
Added test input and expected output files for blank line handling in list renumbering.
tests/data/renumber_ordered_list_input.txt
tests/data/renumber_ordered_list_expected.txt
Added ordered list test input and expected output files for renumbering tests.
tests/lists.rs Added new parameterised test cases blank_lines and ordered_list using new test data files.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant CLI
    participant renumber_lists

    User->>CLI: Run with --renumber option
    CLI->>renumber_lists: Pass input lines
    loop For each line
        renumber_lists->>renumber_lists: Detect blank line?
        alt Blank line
            renumber_lists->>renumber_lists: Append blank line, set prev_blank, continue
        else Numbered list line
            renumber_lists->>renumber_lists: Renumber as needed
        end
    end
    renumber_lists-->>CLI: Output renumbered lines
    CLI-->>User: Show result
Loading

Estimated code review effort

2 (~12 minutes)

Possibly related issues

Possibly related PRs

Poem

Blank lines now drift, unbroken, through lists,
Renumbering flows, no count ever missed.
Tests guard the path, with data anew,
Docs now proclaim what blank lines do.
Code in good order, the lists march on—
Each number in place, blank lines not gone!
📜✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 00c96b0 and 1576185.

📒 Files selected for processing (1)
  • README.md (1 hunks)
📓 Path-based instructions (1)
**/*.md

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.md: Validate Markdown files using make markdownlint.
Run make fmt after any documentation changes to format all Markdown files and fix table markup.
Validate Mermaid diagrams in Markdown files by running make nixie.
Markdown paragraphs and bullet points must be wrapped at 80 columns.
Code blocks must be wrapped at 120 columns.
Tables and headings must not be wrapped.
Use dashes (-) for list bullets.
Use GitHub-flavoured Markdown footnotes ([^1]) for references.

Files:

  • README.md

⚙️ CodeRabbit Configuration File

**/*.md: * Avoid 2nd person or 1st person pronouns ("I", "you", "we")

  • Use en-GB-oxendict (-ize / -our) spelling and grammar
  • Paragraphs and bullets must be wrapped to 80 columns, except where a long URL would prevent this (in which case, silence MD013 for that line)
  • Code blocks should be wrapped to 120 columns.
  • Headings must not be wrapped.
  • Documents must start with a level 1 heading
  • Headings must correctly increase or decrease by no more than one level at a time
  • Use GitHub-flavoured Markdown style for footnotes and endnotes.
  • Numbered footnotes must be numbered by order of appearance in the document.

Files:

  • README.md
🧰 Additional context used
📓 Path-based instructions (1)
**/*.md

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.md: Validate Markdown files using make markdownlint.
Run make fmt after any documentation changes to format all Markdown files and fix table markup.
Validate Mermaid diagrams in Markdown files by running make nixie.
Markdown paragraphs and bullet points must be wrapped at 80 columns.
Code blocks must be wrapped at 120 columns.
Tables and headings must not be wrapped.
Use dashes (-) for list bullets.
Use GitHub-flavoured Markdown footnotes ([^1]) for references.

Files:

  • README.md

⚙️ CodeRabbit Configuration File

**/*.md: * Avoid 2nd person or 1st person pronouns ("I", "you", "we")

  • Use en-GB-oxendict (-ize / -our) spelling and grammar
  • Paragraphs and bullets must be wrapped to 80 columns, except where a long URL would prevent this (in which case, silence MD013 for that line)
  • Code blocks should be wrapped to 120 columns.
  • Headings must not be wrapped.
  • Documents must start with a level 1 heading
  • Headings must correctly increase or decrease by no more than one level at a time
  • Use GitHub-flavoured Markdown style for footnotes and endnotes.
  • Numbered footnotes must be numbered by order of appearance in the document.

Files:

  • README.md
⏰ Context from checks skipped due to timeout of 240000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build-test
🔇 Additional comments (1)
README.md (1)

41-42: Keep the new clause; punctuation and line length are correct.

The sentence now includes the comma and remains within the 80-column limit, so Markdown linting will pass.

✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/investigate-renumber-feature-issue

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey @leynos - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 93cc220 and 011b185.

📒 Files selected for processing (5)
  • README.md (1 hunks)
  • src/lists.rs (1 hunks)
  • tests/data/renumber_blank_lines_expected.txt (1 hunks)
  • tests/data/renumber_blank_lines_input.txt (1 hunks)
  • tests/lists.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
**/*.md

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.md: Validate Markdown files using make markdownlint.
Run make fmt after any documentation changes to format all Markdown files and fix table markup.
Validate Mermaid diagrams in Markdown files by running make nixie.
Markdown paragraphs and bullet points must be wrapped at 80 columns.
Code blocks must be wrapped at 120 columns.
Tables and headings must not be wrapped.
Use dashes (-) for list bullets.
Use GitHub-flavoured Markdown footnotes ([^1]) for references.

Files:

  • README.md

⚙️ CodeRabbit Configuration File

**/*.md: * Avoid 2nd person or 1st person pronouns ("I", "you", "we")

  • Use en-GB-oxendict (-ize / -our) spelling and grammar
  • Paragraphs and bullets must be wrapped to 80 columns, except where a long URL would prevent this (in which case, silence MD013 for that line)
  • Code blocks should be wrapped to 120 columns.
  • Headings must not be wrapped.
  • Documents must start with a level 1 heading
  • Headings must correctly increase or decrease by no more than one level at a time
  • Use GitHub-flavoured Markdown style for footnotes and endnotes.
  • Numbered footnotes must be numbered by order of appearance in the document.

Files:

  • README.md
**/*.rs

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.rs: Comments must use en-GB-oxendict spelling and grammar.
Function documentation must include clear examples.
Every module must begin with a module level (//!) comment explaining the module's purpose and utility.
Document public APIs using Rustdoc comments (///) so documentation can be generated with cargo doc.
Place function attributes after doc comments.
Do not use return in single-line functions.
Prefer immutable data and avoid unnecessary mut bindings.
Handle errors with the Result type instead of panicking where feasible.
Avoid unsafe code unless absolutely necessary and document any usage clearly.
Clippy warnings MUST be disallowed.
Lints must not be silenced except as a last resort.
Lint rule suppressions must be tightly scoped and include a clear reason.
Prefer expect over allow.
Prefer .expect() over .unwrap().
Use concat!() to combine long string literals rather than escaping newlines with a backslash.
Use predicate functions for conditional criteria with more than two branches.
Fix any warnings emitted during tests in the code itself rather than silencing them.
Where a function is too long, extract meaningfully named helper functions adhering to separation of concerns and CQRS.
Where a function has too many parameters, group related parameters in meaningfully named structs.
Where a function is returning a large error consider using Arc to reduce the amount of data returned.
Comment why, not what. Explain assumptions, edge cases, trade-offs, or complexity. Don't echo the obvious.
Use functions and composition. Avoid repetition by extracting reusable logic. Prefer generators or comprehensions, and declarative code to imperative repetition when readable.
Small, meaningful functions. Functions must be small, clear in purpose, single responsibility, and obey command/query segregation.
Name things precisely. Use clear, descriptive variable and function names. For booleans, prefer names with is, has, or should.
Structure log...

Files:

  • src/lists.rs
  • tests/lists.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • src/lists.rs
  • tests/lists.rs
🪛 LanguageTool
tests/data/renumber_blank_lines_input.txt

[typographical] ~1-~1: To join two clauses or introduce examples, consider using an em dash.
Context: 1. pyo3::marker - Rust, accessed on July 14, 2025, <h...

(DASH_RULE)


[typographical] ~4-~4: To join two clauses or introduce examples, consider using an em dash.
Context: .../> 1. Supporting Free-Threaded Python - PyO3 user guide, accessed on July 14, ...

(DASH_RULE)


[typographical] ~7-~7: To join two clauses or introduce examples, consider using an em dash.
Context: .../pyo3.rs/main/free-threading> 1. pyo3 - Rust - Docs.rs, access...

(DASH_RULE)


[typographical] ~7-~7: To join two clauses or introduce examples, consider using an em dash.
Context: ...s/main/free-threading> 1. pyo3 - Rust - Docs.rs, accessed on J...

(DASH_RULE)


[typographical] ~10-~10: To join two clauses or introduce examples, consider using an em dash.
Context: ...://docs.rs/pyo3/0.25.1/pyo3/> 1. pyo3 - Rust - Docs.rs, access...

(DASH_RULE)


[typographical] ~10-~10: To join two clauses or introduce examples, consider using an em dash.
Context: ....rs/pyo3/0.25.1/pyo3/> 1. pyo3 - Rust - Docs.rs, accessed on J...

(DASH_RULE)

README.md

[uncategorized] ~42-~42: Use a comma before ‘so’ if it connects two independent clauses (unless they are closely connected and short).
Context: ... Blank lines between items are ignored so numbering continues uninterrupted. - U...

(COMMA_COMPOUND_SENTENCE_2)

tests/data/renumber_blank_lines_expected.txt

[typographical] ~1-~1: To join two clauses or introduce examples, consider using an em dash.
Context: 1. pyo3::marker - Rust, accessed on July 14, 2025, <h...

(DASH_RULE)


[typographical] ~4-~4: To join two clauses or introduce examples, consider using an em dash.
Context: .../> 2. Supporting Free-Threaded Python - PyO3 user guide, accessed on July 14, ...

(DASH_RULE)


[typographical] ~7-~7: To join two clauses or introduce examples, consider using an em dash.
Context: .../pyo3.rs/main/free-threading> 3. pyo3 - Rust - Docs.rs, access...

(DASH_RULE)


[typographical] ~7-~7: To join two clauses or introduce examples, consider using an em dash.
Context: ...s/main/free-threading> 3. pyo3 - Rust - Docs.rs, accessed on J...

(DASH_RULE)


[typographical] ~10-~10: To join two clauses or introduce examples, consider using an em dash.
Context: ...://docs.rs/pyo3/0.25.1/pyo3/> 4. pyo3 - Rust - Docs.rs, access...

(DASH_RULE)


[typographical] ~10-~10: To join two clauses or introduce examples, consider using an em dash.
Context: ....rs/pyo3/0.25.1/pyo3/> 4. pyo3 - Rust - Docs.rs, accessed on J...

(DASH_RULE)

🔇 Additional comments (4)
tests/data/renumber_blank_lines_input.txt (1)

1-12: Test data correctly demonstrates the blank line scenario.

The input file properly sets up the test case with incorrectly numbered list items (all numbered "1.") separated by blank lines. This effectively tests that the renumbering logic handles blank lines correctly.

tests/data/renumber_blank_lines_expected.txt (1)

1-12: Expected output correctly demonstrates the desired renumbering behaviour.

The expected results show proper sequential numbering (1, 2, 3, 4) whilst preserving the blank lines between list items. This aligns perfectly with the PR objective of ensuring blank lines don't interrupt the renumbering process.

src/lists.rs (1)

98-102: Explicit blank line handling correctly preserves blank lines and maintains state.

The implementation properly detects blank lines using trim().is_empty(), preserves them in the output, and sets the prev_blank flag before continuing. This ensures blank lines don't interfere with the renumbering logic whilst being preserved in the output.

tests/lists.rs (1)

127-130: Test case properly validates blank line handling.

The new blank_lines test case follows the established pattern using the rstest framework and external data files. This provides comprehensive coverage of the blank line renumbering functionality.

Comment thread README.md Outdated
@leynos leynos merged commit 6787208 into main Jul 21, 2025
2 checks passed
@leynos leynos deleted the codex/investigate-renumber-feature-issue branch July 21, 2025 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant