refactor(oxfmt): Update .editorconfig overrides logic to prepare for oxfmtrc overrides#18064
Merged
graphite-app[bot] merged 1 commit intomainfrom Jan 19, 2026
Conversation
github-actions
bot
added
A-cli
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. |
leaysgur
changed the title
.editorconfig overrides logic to prepare for oxfmtrc overrides
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors the configuration logic to prepare for oxfmtrc overrides functionality. The main refactoring moves the conversion logic from Oxfmtrc::into_options() to FormatConfig::into_oxfmt_options(), and introduces a new merge() method for future override support.
Changes:
- Moved format configuration conversion logic from
Oxfmtrcimpl toFormatConfigimpl - Added
FormatConfig::merge()method andjson_merge()helper for future override support - Renamed
resolve_with_overrides()toresolve_with_editorconfig_overrides()for clarity - Updated all call sites and tests to use the new API
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| apps/oxfmt/src/core/oxfmtrc.rs | Added TODO comment, implemented FormatConfig::merge() and into_oxfmt_options(), added json_merge() helper, removed Oxfmtrc::into_options(), updated all tests |
| apps/oxfmt/src/core/config.rs | Updated imports, refactored build_and_validate() to use new API, renamed method for clarity, updated apply_editorconfig() to work with FormatConfig, improved documentation |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
leaysgur
force-pushed
the
01-16-refactor_oxfmt_update_editorconfig_overrides_logic_to_prepare_for_oxfmtrc_overrides
branch
2 times, most recently
from
0dd6ef8 to
56eb9f2
Compare
leaysgur
force-pushed
the
01-16-refactor_oxfmt_update_editorconfig_overrides_logic_to_prepare_for_oxfmtrc_overrides
branch
3 times, most recently
from
f426209 to
8166c80
Compare
Dunqing
approved these changes
Jan 19, 2026
Member
Merge activity
|
graphite-app
bot
force-pushed
the
01-16-refactor_oxfmt_update_editorconfig_overrides_logic_to_prepare_for_oxfmtrc_overrides
branch
from
8166c80 to
a71fa08
Compare
graphite-app
bot
deleted the
01-16-refactor_oxfmt_update_editorconfig_overrides_logic_to_prepare_for_oxfmtrc_overrides
branch
This was referenced Jan 19, 2026
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.
Part of #17585
FormatConfig::merge()will be used later.