Skip to content

Fix eslint-config-prettier silently overriding custom rules - #5955

Merged
canova merged 1 commit into
firefox-devtools:mainfrom
canova:eslint-prettier-fix
Apr 20, 2026
Merged

Fix eslint-config-prettier silently overriding custom rules#5955
canova merged 1 commit into
firefox-devtools:mainfrom
canova:eslint-prettier-fix

Conversation

@canova

@canovacanova commented Apr 17, 2026

Copy link
Copy Markdown
Member

Fixes#5867.

I saw another if branch without a curly brace and I was curious why we don't have a rule for it. And after looking at the eslint config, I realized that there was actually a rule in place:

curly: 'error',

But it looks like prettier rules were overriding it because they were at the end of the config.

This PR moves it right above the custom rule override so it doesn't override our custom rules.

Move prettierConfig before our custom rules block so it only disables
formatting rules from the base configs, while our explicit rules take
precedence. This was causing `curly: 'error'` (and potentially other
custom rules) to be silently disabled.
@canova
canova requested a review from fatadelApril 17, 2026 17:04
@codecov

codecovBot commented Apr 17, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 85.32%. Comparing base (4308a73) to head (ea7e9ba).
⚠️ Report is 4 commits behind head on main.

Files with missing linesPatch %Lines
src/components/stack-chart/Canvas.tsx0.00%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #5955 +/- ##
==========================================
- Coverage 85.37% 85.32% -0.05% 
==========================================
Files 322 322 Lines 32069 32093 +24 Branches 8814 8738 -76 ==========================================
+ Hits 27378 27384 +6 - Misses 4260 4278 +18 
Partials 431 431 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@fatadelfatadel left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great one, thanks for this PR! Could you also add that it closes #5867?

@canova

Copy link
Copy Markdown
MemberAuthor

Oh right, I forgot that we had an issue for it. Thanks for reminding!

@canova
canova merged commit bb3b854 into firefox-devtools:mainApr 20, 2026
19 of 21 checks passed
@fatadelfatadel mentioned this pull request Apr 28, 2026
fatadel added a commit that referenced this pull request Apr 28, 2026
Changes:
[Nazım Can Altınova] Add Adel to the automatic dependency reviews
(#5930)
[fatadel] Fix arrow panel appearing behind marker tooltips (#5926)
[fatadel] Upgrade Node.js from v22 to v24 (#5923)
[Markus Stange] Use createStackTableBySkippingDiscarded in focusSelf.
(#5916)
[Markus Stange] Propagate isJS to symbolicated funcs (#5907)
[Markus Stange] Always render the CPU-usage-aware activity graph when
CPU information is available (#5918)
[Nazım Can Altınova] Fallback to javascript highlighting in the source
view as a backup (#5936)
[Nazım Can Altınova] Properly type the return value of
_languageExtForPath (#5937)
[Nazım Can Altınova] Update typescript eslint dependencies (#5938)
[Markus Stange] Modernize more of the transform functions (#5934)
[Paul Adenot] Fix extractGeckoLogs for structured Log marker format (bug
2022540) (#5927)
[Nazım Can Altınova] Move some profile fetching code into a separate
module. (#5939)
[Markus Stange] Update the hovered item when panning any viewport canvas
(#5903)
[Markus Stange] Migrate Home page animation to CSS transitions and
remove react-transition-group (#5649)
[Nazım Can Altınova] Fix test/lint commands on Windows and fix CI
(#5947)
[Nazım Can Altınova] Convert profile-logic/js-tracer.tsx to a ts file
(#5942)
[Markus Stange] Remove panelLayoutGeneration (#5946)
[fatadel] Add CounterDisplayConfig to counters in the processed profile
format (#5912)
[Nazım Can Altınova] Fix eslint-config-prettier silently overriding
custom rules (#5955)
[fatadel] Dim non-matching nodes in the stack chart when searching
(#5935)
[Nazım Can Altınova] Fix loading .json.gz profiles from inside zip
archives (#5959)
[Ryan Hunt] Add a fullscreen button to the bottom box (#5605)
[Markus Stange] Speed up _computeCallNodeTableHierarchy by keeping
siblings ordered by func (#5964)
[Markus Stange] Replace symbolicator-cli with a profiler-edit node tool
(#5965)
[Nazım Can Altınova] Add "Include idle samples" toggle to the call tree
settings (#5968)
[Nazım Can Altınova] Add dark mode versions of the fullscreen icons
(#5972)
[fatadel] Replace 4 counter track components with a single generic
TrackCounter (#5944)
[fatadel] Use ephemeral port for esbuild's internal dev server (#5974)
[carverdamien] Remove category from LongTaskMarkerPayload (#5975)
And special thanks to our localizers:
de: Ger de: Michael Köhler el: Jim Spentzos en-GB: Ian Neal es-CL: ravmn fr: Théo Chevalier ia: Melo46 it: Francesco Lodolo [:flod] nl: Mark Heijl pt-BR: Marcelo Ghelman ru: Valery Ledovskoy ru: berry sv-SE: Andreas Pettersson tr: Grk zh-CN: Olvcpr423 zh-CN: wxie zh-TW: Pin-guang Chen
Sign up for freeto 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.

Add linter check for curly braces with conditional blocks

2 participants

@canova@fatadel