Skip to content

Refactor footnotes and document footnote flag#114

Merged
leynos merged 2 commits intomainfrom
covvsk-codex/refactor-convert_inline-and-improve-tests
Jul 21, 2025
Merged

Refactor footnotes and document footnote flag#114
leynos merged 2 commits intomainfrom
covvsk-codex/refactor-convert_inline-and-improve-tests

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 21, 2025

Summary

  • simplify inline footnote handling with helpers
  • clarify variable naming in convert_block
  • extend convert_footnotes unit tests
  • document helper macros in footnote integration tests
  • describe footnote option usage in docs and README

Testing

  • make lint
  • make test

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

Summary by Sourcery

Refactor inline and block footnote conversion logic, extend tests for various footnote scenarios, and document the footnotes option in README and docs.

Enhancements:

  • Extract inline footnote capture and build logic into helper functions for cleaner conversion
  • Rename variables in convert_block for better clarity of footnote start and end indices

Documentation:

  • Update README and documentation to describe enabling footnote conversion via the footnotes option in Options

Tests:

  • Add unit tests for multiple inline notes, ignoring non-numeric and empty inputs, and final contiguous footnote blocks
  • Add integration test to verify helper macros availability for footnote tests

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Jul 21, 2025

Reviewer's Guide

This PR refactors footnote handling by extracting inline helper functions, clarifies naming in block conversion, expands unit tests and integration tests for footnotes, and updates documentation and README to describe the new footnotes option flag.

Class diagram for refactored footnote helpers in footnotes.rs

classDiagram
    class footnotes {
    }
    class capture_parts {
        +capture_parts(caps: Captures) (fn)
    }
    class build_footnote {
        +build_footnote(pre: str, punc: str, style: str, num: str, boundary: str) String (fn)
    }
    class convert_inline {
        +convert_inline(text: str) String (fn)
    }
    footnotes <.. capture_parts : uses
    footnotes <.. build_footnote : uses
    convert_inline ..> capture_parts : calls
    convert_inline ..> build_footnote : calls
Loading

Class diagram for updated convert_block function variable naming

classDiagram
    class convert_block {
        +convert_block(lines: &mut [String]) (fn)
        -footnote_start
        -trimmed_end
    }
Loading

File-Level Changes

Change Details Files
Extract inline footnote processing into reusable helpers
  • Add capture_parts to decompose regex captures
  • Add build_footnote to format inline footnote strings
  • Refactor convert_inline to use the new helpers
src/footnotes.rs
Clarify variable names and bounds in block footnote conversion
  • Rename start/end to footnote_start/trimmed_end
  • Update conditional and loop to use the new names
src/footnotes.rs
Enhance convert_footnotes unit coverage
  • Add test for multiple inline notes in one line
  • Add test ignoring non-numeric footnote blocks
  • Add test for empty input
  • Add test for converting only the final contiguous footnote block
src/footnotes.rs
Document and verify helper macros in integration tests
  • Add module doc comment explaining include_lines!/lines_vec! usage
  • Add macros_available test to confirm macro re-exports
tests/footnotes.rs
Document footnotes option in README and docs
  • Enable footnotes flag in README examples
  • Clarify footnotes option in CLI and library usage sections
  • Update docs/footnote-conversion.md to mention Options { footnotes: true }
README.md
docs/footnote-conversion.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
    • Improved README and footnote conversion documentation for clarity, including updated usage instructions and configuration details.
  • Refactor
    • Refactored internal footnote conversion logic for better modularity without changing behaviour.
  • Tests
    • Added new unit and integration tests to increase coverage and verify edge cases in footnote conversion.
    • Enhanced test documentation and confirmed availability of helper macros in tests.

Walkthrough

Update documentation and usage examples to clarify how to enable footnote conversion in the library. Refactor internal footnote conversion logic for improved modularity by extracting helper functions. Add new unit and integration tests to increase coverage and verify macro availability. No changes to public APIs or core behaviour.

Changes

File(s) Change Summary
README.md, docs/footnote-conversion.md Clarify usage and configuration for enabling footnote conversion; update examples and documentation.
src/footnotes.rs Refactor footnote conversion logic with new private helpers; rename variables for clarity; add unit tests.
tests/footnotes.rs Enhance integration test documentation; add test for macro availability; no changes to existing test logic.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Library
    participant Footnotes

    User->>Library: Call process_stream_opts(input, Options { footnotes: true, ... })
    Library->>Footnotes: convert_footnotes(input)
    Footnotes->>Footnotes: convert_inline()
    Footnotes->>Footnotes: convert_block()
    Footnotes-->>Library: converted_output
    Library-->>User: output with GitHub-style footnotes
Loading

Estimated code review effort

2 (~15 minutes)

Possibly related PRs

Poem

In the land of docs and code so neat,
Footnotes now march in tidy retreat.
Helpers extracted, tests on parade,
Macros confirmed, confusion allayed.
Markdown’s footnotes, now clear and bright—
Documentation shines, everything’s right!
🦶📚✨


📜 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 c0121af and f0012e3.

📒 Files selected for processing (4)
  • README.md (3 hunks)
  • docs/footnote-conversion.md (1 hunks)
  • src/footnotes.rs (3 hunks)
  • tests/footnotes.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
**/*.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:

  • docs/footnote-conversion.md
  • README.md
**/*.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:

  • tests/footnotes.rs
  • src/footnotes.rs
🪛 LanguageTool
docs/footnote-conversion.md

[typographical] ~6-~6: Two consecutive dots
Context: ...level process_stream_opts helper. Set Options { footnotes: true, ..Default::default() } when calling `proc...

(DOUBLE_PUNCTUATION)

🔇 Additional comments (7)
src/footnotes.rs (3)

20-36: Excellent refactoring of inline conversion logic.

The extraction of capture_parts and build_footnote helper functions improves modularity and readability whilst maintaining the same functionality. The doc comments follow proper placement before attributes, and the #[inline] annotations are appropriate for these small, frequently-called functions.


80-86: Improved variable naming enhances code clarity.

Renaming (start, end) to (footnote_start, trimmed_end) makes the code more self-documenting whilst preserving the existing logic. The descriptive names clearly indicate the purpose of these indices in the footnote processing context.


152-193: Comprehensive test coverage addresses important edge cases.

The new unit tests significantly improve coverage by testing multiple inline footnotes, non-numeric blocks, empty input handling, and contiguous block processing. The test names are descriptive and follow consistent naming conventions, whilst the assertions properly validate expected behaviour.

tests/footnotes.rs (2)

2-11: Excellent documentation explains integration test approach.

The enhanced module documentation clearly explains the purpose of integration tests, the testing methodology, and the role of helper macros. The documentation follows proper en-GB conventions and provides valuable context for maintainers.


18-22: Pragmatic test verifies macro availability.

The macros_available test provides a simple but effective verification that the helper macros lines_vec! and include_lines! are properly re-exported and functional. The use of underscore-prefixed variables correctly indicates intentional non-use.

docs/footnote-conversion.md (1)

5-7: Clear documentation of footnote enablement process.

The updated documentation effectively explains how to enable footnote conversion through process_stream_opts with the Options { footnotes: true, ..Default::default() } syntax. This aligns well with the PR objective to document the footnotes flag usage.

Note: The static analysis tool flagged consecutive dots, but ..Default::default() is correct Rust struct update syntax.

README.md (1)

113-114: Consistent documentation updates align with PR objectives.

The README updates effectively demonstrate footnote usage by adding footnotes: true to the example Options struct and clarifying that footnote conversion is conditional. The text reformatting improves readability whilst maintaining consistency with the detailed documentation.

Also applies to: 126-126, 138-139

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch covvsk-codex/refactor-convert_inline-and-improve-tests

🪧 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!

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `src/footnotes.rs:82` </location>
<code_context>
+    let (footnote_start, trimmed_end) = trimmed_range(lines, |l| FOOTNOTE_LINE_RE.is_match(l));

-    if start >= end || lines[start].trim_start().starts_with("[^") {
+    if footnote_start >= trimmed_end || lines[footnote_start].trim_start().starts_with("[^") {
         return;
     }
</code_context>

<issue_to_address>
The early return condition may skip valid footnote blocks if the first line is already formatted.

Currently, if the first line is already in footnote format, the function exits and does not process the rest of the block. Please verify if this is intentional or if lines after the first should also be checked for conversion.
</issue_to_address>

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.

Comment thread src/footnotes.rs
let (footnote_start, trimmed_end) = trimmed_range(lines, |l| FOOTNOTE_LINE_RE.is_match(l));

if start >= end || lines[start].trim_start().starts_with("[^") {
if footnote_start >= trimmed_end || lines[footnote_start].trim_start().starts_with("[^") {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

question (bug_risk): The early return condition may skip valid footnote blocks if the first line is already formatted.

Currently, if the first line is already in footnote format, the function exits and does not process the rest of the block. Please verify if this is intentional or if lines after the first should also be checked for conversion.

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 21, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 21, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 21, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 21, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos leynos merged commit f4d7aeb into main Jul 21, 2025
2 checks passed
@leynos leynos deleted the covvsk-codex/refactor-convert_inline-and-improve-tests branch July 21, 2025 18:31
@coderabbitai coderabbitai Bot mentioned this pull request Jul 21, 2025
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