Skip disable line action for self-resolving cops#3945
Merged
rafaelfranca merged 3 commits intoShopify:mainfrom Feb 9, 2026
Merged
Conversation
sucicfilip
force-pushed
the
fix/skip-disable-action-for-self-resolving-cops
branch
2 times, most recently
from
e0f346c to
ecac555
Compare
rafaelfranca
added
bugfix
rafaelfranca
force-pushed
the
fix/skip-disable-action-for-self-resolving-cops
branch
2 times, most recently
from
f7fda53 to
80311a5
Compare
rafaelfranca
approved these changes
Feb 9, 2026
vinistock
reviewed
Feb 9, 2026
Since we only check for inclusion and don't care about order or duplicates, we are use a set. This is a micro-optimization but it makes the intent clearer and is more efficient for lookups.
rafaelfranca
force-pushed
the
fix/skip-disable-action-for-self-resolving-cops
branch
from
cefd9e1 to
0fd0137
Compare
Contributor
Author
|
Thanks for the quick review :-) |
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
3 participants
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.
Motivation
When
Layout/EmptyCommentis reported, the "Disable Layout/EmptyComment for this line" code action adds a# rubocop:disableinline comment, which makes the comment no longer empty, resolving the original offense. This then triggersLint/RedundantCopDisableDirective, so the user ends up in a loop.Implementation
Added a
SELF_RESOLVING_DISABLE_COPSconstant toRuboCopDiagnosticlisting cops where an inline disable would resolve the offense itself. The disable line action is skipped for these cops. Currently only includesLayout/EmptyCommentbut the list can be extended if other similar cases come up.Automated Tests
Added a test in
code_actions_formatting_test.rbthat verifies no disable action is offered forLayout/EmptyComment.Manual Tests
#with nothing after it)Layout/EmptyCommentdiagnostic