Add prefer_scaled_to_fit opt-in rule#6609
Open
DemiDevv wants to merge 3 commits into
Open
Conversation
Generated by 🚫 Danger |
Author
|
@SimplyDanny It seems like some CI checks are stuck in "Waiting for status to be reported" for a while. Is there anything I need to do on my end, or is this expected? |
Author
|
Gentle ping @SimplyDanny — the 14 pending checks haven't changed in over a week. Could you take a look when you have a moment? Thanks! |
SimplyDanny
force-pushed
the
demidev/prefer-scaled-to-fit
branch
from
1ce8651 to
cfe828d
Compare
Collaborator
|
@DemiDevv: I rebased your branch. Checks are running now. |
Author
|
@SimplyDanny Gentle ping — this has been ready for review for a few weeks now with all checks passing. Would appreciate a look when you have a moment! |
SimplyDanny
requested changes
Jun 16, 2026
SimplyDanny
left a comment
SimplyDanny
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for the work and sorry for the delay! Please see my findings (and questions).
| import SwiftSyntax | ||
|
|
||
| @SwiftSyntaxRule(optIn: true) | ||
| struct PreferScaledToFitRule: Rule { |
Collaborator
There was a problem hiding this comment.
There are a few Legacy... rules already. I wonder whether we should name this one in a similar way. What do you think?
All of them are enabled by default (not opt-in) and support auto-correction using LegacyFunctionVisitor.
|
|
||
| static let description = RuleDescription( | ||
| identifier: "prefer_scaled_to_fit", | ||
| name: "Prefer Scaled To Fit", |
Collaborator
There was a problem hiding this comment.
Title style:
Suggested change
| name: "Prefer Scaled To Fit", | |
| name: "Prefer Scaled to Fit", |
Comment on lines
+52
to
+53
| node.arguments.count == 1, | ||
| let argument = node.arguments.first, |
Collaborator
There was a problem hiding this comment.
Suggested change
| node.arguments.count == 1, | |
| let argument = node.arguments.first, | |
| let argument = node.arguments.onlyElement, |
Comment on lines
+61
to
+62
| let valueName = memberValue.declName.baseName.text as String?, | ||
| valueName == "fit" || valueName == "fill" |
Collaborator
There was a problem hiding this comment.
Suggested change
| let valueName = memberValue.declName.baseName.text as String?, | |
| valueName == "fit" || valueName == "fill" | |
| ["fit, "fill"].contains(memberValue.declName.baseName.text) |
| } | ||
|
|
||
| guard | ||
| let memberValue = argument.expression.as(MemberAccessExprSyntax.self), |
Collaborator
There was a problem hiding this comment.
Should we also check that base is nil or ContentMode.
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.
Closes #5713
Adds a new opt-in rule
prefer_scaled_to_fitthat suggests usingscaledToFit()orscaledToFill()instead ofaspectRatio(contentMode:)when the content mode is a constant(
.fitor.fill).As noted in Apple's documentation,
scaledToFit()is equivalent toaspectRatio(nil, contentMode: .fit), so the shorter form ispreferred when no custom aspect ratio is provided.