fix: preseve top level names for name thrashing#9695
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a regression in IR → Python code generation where demoted top-level definitions (functions/classes) could incorrectly keep their original name in the emitted @app.cell signature, instead of reverting to the canonical anonymous cell name (def _(...):). This aligns generate_filecontents_from_ir() with the existing TOPLEVEL_CELL_PREFIX-based naming scheme used elsewhere so demotion logic can reliably anonymize names.
Changes:
- Prefix
FunctionCell/ClassCellnames withTOPLEVEL_CELL_PREFIXduring IR → Python generation soTopLevelExtractioncan correctly revert demoted cells to_. - Add regression tests to ensure demoted
@app.functionserialization does not producedef foo(...):for the cell signature. - Add a (partial) test covering class-demotion naming behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
marimo/_ast/codegen.py |
Ensures IR → Python generation marks top-level function/class cells with TOPLEVEL_CELL_PREFIX so demotion anonymizes cell names correctly. |
tests/_ast/test_codegen.py |
Adds regression tests for demoted function/class cells to avoid preserving original definition names in @app.cell signatures. |
Comment on lines
+2232
to
+2234
| # The demoted cell signature must be `def _(...)`, not `def MyClass(...)`. | ||
| assert "@app.cell\ndef MyClass(" not in result | ||
| assert "@app.cell\ndef _(" in result |
|
🚀 Development release published. You may be able to view the changes at https://marimo.app?v=0.23.9-dev9 |
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
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
Closes #9693
We set class/function top level definitions to
*namefor their name to distinguish them from a normally named cell. Direct calls to ir conversion missed this detail resulting in immediate conversion fromir->codein having redundant cell names.This PR enforces the naming scheme for top level definitions, thus properly preserving the cell name reversion to
_on toplevel "demotion".