Skip to content

refactor(linter): simplify config conflict grouping#21636

Merged
graphite-app[bot] merged 1 commit intomainfrom
c/04-22-refactor_oxlint_simplify_config_conflict_grouping
Apr 22, 2026
Merged

refactor(linter): simplify config conflict grouping#21636
graphite-app[bot] merged 1 commit intomainfrom
c/04-22-refactor_oxlint_simplify_config_conflict_grouping

Conversation

@camc314
Copy link
Copy Markdown
Contributor

@camc314 camc314 commented Apr 22, 2026

No description provided.

Copy link
Copy Markdown
Contributor Author

camc314 commented Apr 22, 2026


How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent changes, fast-track this PR to the front of 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.

@camc314 camc314 marked this pull request as ready for review April 22, 2026 09:47
Copilot AI review requested due to automatic review settings April 22, 2026 09:47
@camc314 camc314 self-assigned this Apr 22, 2026
@camc314 camc314 changed the title refactor(oxlint): simplify config conflict grouping refactor(linter): simplify config conflict grouping Apr 22, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Refactors oxlint nested-config loading to simplify how discovered config files are grouped by directory before loading and conflict reporting.

Changes:

  • Replace per-directory (json, jsonc, js) tuple tracking with a single Vec<DiscoveredConfigFile> per directory.
  • Simplify conflict detection and single-config dispatch logic using the collected per-directory vectors.

Comment thread apps/oxlint/src/config_loader.rs
Comment thread apps/oxlint/src/config_loader.rs Outdated
@camc314 camc314 force-pushed the c/04-22-refactor_linter_introduce_configconflict_struct_for_conflicting_config_files branch from e9bda23 to 921af18 Compare April 22, 2026 10:28
@camc314 camc314 force-pushed the c/04-22-refactor_oxlint_simplify_config_conflict_grouping branch from 7c91d8a to 6af3fae Compare April 22, 2026 10:28
@camc314 camc314 added the 0-merge Merge with Graphite Merge Queue label Apr 22, 2026
Copy link
Copy Markdown
Contributor Author

camc314 commented Apr 22, 2026

Merge activity

@graphite-app graphite-app Bot changed the base branch from c/04-22-refactor_linter_introduce_configconflict_struct_for_conflicting_config_files to graphite-base/21636 April 22, 2026 10:37
@camc314 camc314 force-pushed the c/04-22-refactor_oxlint_simplify_config_conflict_grouping branch from 01dc5a0 to 298cf12 Compare April 22, 2026 10:39
@camc314 camc314 force-pushed the graphite-base/21636 branch from 921af18 to be46a91 Compare April 22, 2026 10:39
@camc314 camc314 changed the base branch from graphite-base/21636 to c/04-22-refactor_linter_introduce_configconflict_struct_for_conflicting_config_files April 22, 2026 10:39
Base automatically changed from c/04-22-refactor_linter_introduce_configconflict_struct_for_conflicting_config_files to main April 22, 2026 10:41
@camc314 camc314 changed the title refactor(linter): simplify config conflict grouping refactor(linter): simplify config conflict groupin Apr 22, 2026
@camc314 camc314 changed the title refactor(linter): simplify config conflict groupin refactor(linter): simplify config conflict grouping Apr 22, 2026
@graphite-app graphite-app Bot force-pushed the c/04-22-refactor_oxlint_simplify_config_conflict_grouping branch from a083f5c to 735aba2 Compare April 22, 2026 11:16
@graphite-app graphite-app Bot merged commit 735aba2 into main Apr 22, 2026
25 checks passed
@graphite-app graphite-app Bot deleted the c/04-22-refactor_oxlint_simplify_config_conflict_grouping branch April 22, 2026 11:20
@graphite-app graphite-app Bot removed the 0-merge Merge with Graphite Merge Queue label Apr 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants