-
Notifications
You must be signed in to change notification settings - Fork 812
fix: recognize class variables used within class scope as non-external dependencies (#7265) #7273
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: recognize class variables used within class scope as non-externa…
…l dependencies (#7265) ## Summary Fixes #7265 When a class had a class variable (like `A: int = 1`) and that variable was referenced within the class scope (e.g., in method default parameters or other class variable definitions), marimo incorrectly concluded the class definition could not be reused. This was because `A` was being treated as an external dependency rather than a class-scoped variable.
- Loading branch information
commit 37dbef5972c91ed9ab6591d3af5ad12e47136b67
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import marimo | ||
|
|
||
| __generated_with = "0.18.0" | ||
| app = marimo.App(width="medium") | ||
|
|
||
|
|
||
| @app.class_definition | ||
| # This should be reusable | ||
| class One: | ||
| A: int = 1 | ||
|
|
||
| def run(a: A = 1) -> int: | ||
| return a | ||
|
|
||
|
|
||
| @app.class_definition | ||
| # This should be a pure-class | ||
| class Two: | ||
| A: int = 1 | ||
|
|
||
| def run(a: int = 1) -> int: | ||
| return a | ||
|
|
||
|
|
||
| @app.cell | ||
| def _(): | ||
| C = int | ||
| return (C,) | ||
|
|
||
|
|
||
| @app.cell | ||
| def _(): | ||
| value = 1 | ||
| return (value,) | ||
|
|
||
|
|
||
| @app.cell | ||
| def _(C): | ||
| # This should NOT be reusable (depends on C) | ||
| class Three: | ||
| A: int = 1 | ||
| B: int = 1 | ||
|
|
||
| def run(a: C = 1) -> int: | ||
| return a | ||
| return | ||
|
|
||
|
|
||
| @app.cell | ||
| def _(C): | ||
| # This should NOT be reusable (depends on C) | ||
| class Four: | ||
| A: int = 1 | ||
| B: C = 1 | ||
|
|
||
| def run(a: B = 1) -> int: | ||
| return a | ||
| return | ||
|
|
||
|
|
||
| @app.cell | ||
| def _(value): | ||
| # This should NOT be reusable (depends on value) | ||
| class Five: | ||
| A: int = 1 | ||
|
|
||
| def run(a: A = value) -> int: | ||
| return a | ||
| return | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| app.run() |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Line executed multiple times inside loop
The statement
unbounded_refs |= mock_visitor.refs - ignore_refsis executed inside the outerfor var in mock_visitor.variable_data:loop, causing it to run once per class variable instead of once total. This incorrectly addsmock_visitor.refs - ignore_refstounbounded_refsmultiple times. The line needs to be moved outside the outer loop to execute only after all variables have been processed.