refactor(ast_tools/formatter): shorten code #12929
Merged
Conversation
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
Member
Author
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
github-actions
bot
added
the
C-cleanup
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the formatter code to make it more concise and robust by utilizing existing schema utility methods. The refactoring replaces manual iteration and inheritance handling with built-in methods that properly handle multi-level enum inheritance.
Key changes:
- Simplified statement variant collection using
Schema::type_by_nameandEnumDef::all_variants - Improved handling of enum inheritance chains
- Reduced code complexity while maintaining equivalent functionality
camc314
approved these changes
Aug 9, 2025
Contributor
Merge activity
|
Follow-on after #12864. Pure refactor, does not alter generated code. Shorten code by using `Schema::type_by_name` and `EnumDef::all_variants` methods. `EnumDef::all_variants` iterates over all variants of an enum, including inherited variants. As well as being shorter, it also correctly handles multiple layers of inheritance e.g. if `X` inherits variants from `Y`, and `Y` inherits variants from `Z`. In the case of `Statement`, inheritance is only 1 level deep, so it makes no difference - but it might if we change the AST later on.
graphite-app
bot
force-pushed
the
08-09-refactor_ast_tools_formatter_shorten_code
branch
from
5149178 to
bdaf569
Compare
graphite-app
bot
deleted the
08-09-refactor_ast_tools_formatter_shorten_code
branch
taearls
pushed a commit
to taearls/oxc
that referenced
this pull request
Aug 12, 2025
Follow-on after oxc-project#12864. Pure refactor, does not alter generated code. Shorten code by using `Schema::type_by_name` and `EnumDef::all_variants` methods. `EnumDef::all_variants` iterates over all variants of an enum, including inherited variants. As well as being shorter, it also correctly handles multiple layers of inheritance e.g. if `X` inherits variants from `Y`, and `Y` inherits variants from `Z`. In the case of `Statement`, inheritance is only 1 level deep, so it makes no difference - but it might if we change the AST later on.
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.
Follow-on after #12864. Pure refactor, does not alter generated code.
Shorten code by using
Schema::type_by_nameandEnumDef::all_variantsmethods.EnumDef::all_variantsiterates over all variants of an enum, including inherited variants. As well as being shorter, it also correctly handles multiple layers of inheritance e.g. ifXinherits variants fromY, andYinherits variants fromZ.In the case of
Statement, inheritance is only 1 level deep, so it makes no difference - but it might if we change the AST later on.