Skip to content

Encapsulate ParsedSpans#64

Merged
leynos merged 4 commits intomainfrom
codex/refactor-parsedspans-struct-for-encapsulation
Jul 8, 2025
Merged

Encapsulate ParsedSpans#64
leynos merged 4 commits intomainfrom
codex/refactor-parsedspans-struct-for-encapsulation

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 7, 2025

Summary

  • keep span lists internal by default
  • expose constructor and read-only accessors
  • update parser tests to use the new API

Testing

  • make lint
  • make test

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

Summary by Sourcery

Encapsulate the internal span lists of ParsedSpans by making its fields private and introducing a public constructor and read-only accessors, and update the parser implementation and tests to use the new API.

Enhancements:

  • Make the ParsedSpans span vectors private and add a ParsedSpans::new constructor
  • Provide read-only accessor methods (imports(), typedefs(), etc.) for each span category
  • Replace direct field access in the parser and tree builder with the new accessor methods

Documentation:

  • Improve ParsedSpans documentation to reference the new constructor and invariants

Tests:

  • Update parser tests to instantiate ParsedSpans via new and to use the accessor methods in assertions

Make fields private, add constructor and getters, and update parser tests.
@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Jul 7, 2025

Reviewer's Guide

Encapsulates the internal span lists in ParsedSpans by making the fields private, introducing a constructor and read-only getter methods, and updating parser logic and tests to use the new API.

Class diagram for encapsulated ParsedSpans

classDiagram
    class ParsedSpans {
        - imports: Vec<Span>
        - typedefs: Vec<Span>
        - relations: Vec<Span>
        - indexes: Vec<Span>
        - functions: Vec<Span>
        - rules: Vec<Span>
        + new(imports: Vec<Span>, typedefs: Vec<Span>, relations: Vec<Span>, indexes: Vec<Span>, functions: Vec<Span>, rules: Vec<Span>)
        + imports() &[Span]
        + typedefs() &[Span]
        + relations() &[Span]
        + indexes() &[Span]
        + functions() &[Span]
        + rules() &[Span]
        - assert_sorted()
    }
    class Span
    ParsedSpans --> Span : contains Vec<>
Loading

File-Level Changes

Change Details Files
Encapsulate ParsedSpans internals and update API usage
  • Made ParsedSpans span fields private
  • Added ParsedSpans::new constructor to initialize spans
  • Added read-only getters for each span list
  • Replaced direct struct literals in parse_tokens with the new constructor
  • Replaced direct .imports/.typedefs field accesses with .imports()/accessors
  • Updated tests to construct and access ParsedSpans using the new API
src/parser/mod.rs

Possibly linked issues

  • #0: PR implements encapsulation of ParsedSpans: private fields, constructor, getters, non_exhaustive, addressing the issue.

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 7, 2025

Warning

Rate limit exceeded

@leynos has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 5 minutes and 46 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 158568b and d2d351e.

📒 Files selected for processing (1)
  • src/parser/mod.rs (6 hunks)

Summary by CodeRabbit

  • New Features

    • Introduced new accessor methods for span categories, providing a clearer and more consistent way to access parsed data.
  • Refactor

    • Improved encapsulation by making span fields private and requiring use of accessor methods.
    • Updated construction of parsed data to use a new constructor that enforces data validity.
    • Adjusted related code and tests to align with the updated API.

Walkthrough

The ParsedSpans struct was refactored to make its fields private and non-exhaustive, enforcing encapsulation. A constructor with debug assertions for sortedness and non-overlapping spans was introduced, along with public accessor methods. All usage sites were updated to use the new API, and tests were adjusted for the stricter construction requirements.

Changes

File(s) Change Summary
src/parser/mod.rs, related usage sites Made ParsedSpans fields private and non-exhaustive; added constructor with invariants and accessor methods; updated all field accesses to use accessors and constructor.
Tests using ParsedSpans Updated test code to initialise all fields explicitly due to private, non-exhaustive struct.

Sequence Diagram(s)

sequenceDiagram
    participant Caller
    participant ParsedSpans

    Caller->>ParsedSpans: new(imports, typedefs, relations, indexes, functions, rules)
    ParsedSpans-->>ParsedSpans: Debug assertions (sorted, non-overlapping)
    ParsedSpans-->>Caller: ParsedSpans instance

    Caller->>ParsedSpans: imports()/typedefs()/relations()/...
    ParsedSpans-->>Caller: &[Span] for requested category
Loading

Possibly related issues

Possibly related PRs

Poem

In the warren of code, a new span appears,
Encapsulated fields, allaying old fears.
With accessors neat and assertions in tow,
Our ParsedSpans now orderly grow.
Debug bunnies cheer, their paws in the air—
For sorted, safe spans are handled with care! 🐇

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/refactor-parsedspans-struct-for-encapsulation

🪧 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 auto-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 - here's some feedback:

  • There are still direct field accesses like spans.imports in build_green_tree; please replace all of them with the new accessor methods (e.g. spans.imports()).
  • Since ParsedSpans::new documents that its inputs must be sorted and non-overlapping, consider adding debug assertions inside new so any violations are caught immediately.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- There are still direct field accesses like `spans.imports` in build_green_tree; please replace all of them with the new accessor methods (e.g. `spans.imports()`).
- Since `ParsedSpans::new` documents that its inputs must be sorted and non-overlapping, consider adding debug assertions inside new so any violations are caught immediately.

## Individual Comments

### Comment 1
<location> `src/parser/mod.rs:201` </location>
<code_context>
+///
+/// Instances are constructed via [`ParsedSpans::new`] to guarantee the
+/// internal lists remain sorted and non-overlapping.
+#[non_exhaustive]
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct ParsedSpans {
</code_context>

<issue_to_address>
The module is missing a `//!` comment at the top as required by the review instructions.

Please add a `//!` module-level comment at the very top of the file to describe the module's purpose, as per the review instructions.
</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/parser/mod.rs
@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 8, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 8, 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.

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: 2

♻️ Duplicate comments (1)
src/parser/mod.rs (1)

1-8: Module documentation properly addresses past review feedback.

The //! module-level comment has been added as required by the coding guidelines and past review feedback. The documentation clearly explains the module's purpose and capabilities.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between eb0b867 and 158568b.

📒 Files selected for processing (1)
  • src/parser/mod.rs (6 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
`**/*.rs`: Comment why, not what. Explain assumptions, edge cases, trade-offs, o...

**/*.rs: Comment why, not what. Explain assumptions, edge cases, trade-offs, or complexity. Don't echo the obvious.
Comments must use en-GB-oxendict spelling and grammar.
Function documentation must include clear examples.
Name things precisely. Use clear, descriptive variable and function names. For booleans, prefer names with is, has, or should.
Each file should encapsulate a coherent module. Group related code (e.g., models + utilities + fixtures) close together.
Group by feature, not layer. Colocate views, logic, fixtures, and helpers related to a domain concept rather than splitting by type.
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.
Use predicate functions for conditional criteria with more than two branches.
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.
Prefer .expect() over .unwrap().

📄 Source: CodeRabbit Inference Engine (AGENTS.md)

List of files the instruction was applied to:

  • src/parser/mod.rs
`**/*.rs`: * Seek to keep the cyclomatic complexity of functions no more than 12...

**/*.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 must use en-GB-oxendict 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/

⚙️ Source: CodeRabbit Configuration File

List of files the instruction was applied to:

  • src/parser/mod.rs
🔇 Additional comments (3)
src/parser/mod.rs (3)

198-216: Well-implemented encapsulation design.

The changes properly encapsulate the ParsedSpans structure by making fields private and adding #[non_exhaustive]. The updated documentation correctly references the new constructor, ensuring users understand the new API requirements.


254-289: Excellent accessor method design.

The accessor methods follow a consistent pattern with proper documentation and #[must_use] attributes. Returning &[Span] provides efficient read-only access whilst maintaining encapsulation.


372-379: Comprehensive and correct API migration.

All usage sites have been properly updated to use the new constructor and accessor methods. The migration maintains the same semantics whilst enforcing proper encapsulation principles.

Also applies to: 929-934

Comment thread src/parser/mod.rs Outdated
Comment thread src/parser/mod.rs
@leynos leynos merged commit 444fcac into main Jul 8, 2025
2 checks passed
@leynos leynos deleted the codex/refactor-parsedspans-struct-for-encapsulation branch July 8, 2025 07:29
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