Simplify `if-else` block into single `return` statement #175574

ValentinVignal · 2025-09-18T08:34:24Z

Follow up of #175396

This PR applies the code change suggestion from gemini review

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

gemini-code-assist

Code Review

This pull request correctly simplifies several if-else blocks into single return statements, which improves code conciseness. I've added suggestions to further simplify these by converting the single-line function bodies into arrow functions, which is a common practice for cleaner code and aligns with the Effective Dart style guide.

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

@justinmc Do you prefer the arrow function too?

I don't think there's any con to using the arrows, but I might be wrong.

Great, I updated the code to use expression body in Use expression body

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_theme_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_theme_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_theme_test.dart

            trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-              if (states.contains(WidgetState.hovered)) {
-                return true;
-              }
-              return false;
+              return states.contains(WidgetState.hovered);
            }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

gemini-code-assist · 2025-09-18T08:35:42Z

packages/flutter/test/material/scrollbar_theme_test.dart

        WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-          if (states.contains(WidgetState.hovered)) {
-            return true;
-          }
-          return false;
+          return states.contains(WidgetState.hovered);
        }),


For conciseness, you can use an arrow function (=>) for this single-line function body. This aligns with the Effective Dart style guide.¹

WidgetStateProperty.resolveWith((Set<WidgetState> states) => states.contains(WidgetState.hovered)),

Style Guide References

Footnotes

↩

victorsanni

This PR qualifies for a test exemption.

victorsanni · 2025-09-22T23:50:44Z

packages/flutter/test/material/scrollbar_test.dart

              trackVisibility: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-                if (states.contains(WidgetState.hovered)) {
-                  return true;
-                }
-                return false;
+                return states.contains(WidgetState.hovered);
              }),


I don't think there's any con to using the arrows, but I might be wrong.

dkwingsmt

LGTM, thank you for the cleanup!

auto-submit · 2025-10-07T06:26:22Z

autosubmit label was removed for flutter/flutter/175574, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

…-return-statement

…utter/flutter#175574)

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. f: scrolling Viewports, list views, slivers, etc. labels Sep 18, 2025

ValentinVignal mentioned this pull request Sep 18, 2025

Migrate to WidgetState #175396

Merged

9 tasks

gemini-code-assist bot reviewed Sep 18, 2025

View reviewed changes

ValentinVignal requested review from goderbauer and justinmc September 18, 2025 08:54

victorsanni approved these changes Sep 22, 2025

View reviewed changes

ValentinVignal force-pushed the flutter/simplify-if-else-block-into-single-return-statement branch from 6c2d429 to 20cf1b7 Compare September 23, 2025 04:52

dkwingsmt self-requested a review October 1, 2025 18:13

dkwingsmt approved these changes Oct 7, 2025

View reviewed changes

ValentinVignal added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 7, 2025

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 7, 2025

ValentinVignal added 2 commits October 7, 2025 14:35

Simplify if-else block into single return statement

fe7ef38

Use expression body

5fc8562

ValentinVignal force-pushed the flutter/simplify-if-else-block-into-single-return-statement branch from 20cf1b7 to 5fc8562 Compare October 7, 2025 06:36

ValentinVignal added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 7, 2025

auto-submit bot added this pull request to the merge queue Oct 7, 2025

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 7, 2025

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 7, 2025

Merge branch 'master' into flutter/simplify-if-else-block-into-single…

5593392

…-return-statement

dkwingsmt added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 8, 2025

auto-submit bot added this pull request to the merge queue Oct 8, 2025

Merged via the queue into flutter:master with commit 6e5d007 Oct 8, 2025
76 of 77 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 8, 2025

engine-flutter-autoroll mentioned this pull request Oct 9, 2025

Roll Flutter from e11e2c11288b to 76dbf9113d1e (23 revisions) flutter/packages#10196

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 9, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

8d88695

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 9, 2025

Roll Flutter from e11e2c11288b to cd189a18da69 (24 revisions) flutter/packages#10197

Closed

engine-flutter-autoroll mentioned this pull request Oct 9, 2025

Roll Flutter from e11e2c11288b to 238db3574bba (26 revisions) flutter/packages#10200

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

ca9f586

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to 309bde139aab (46 revisions) flutter/packages#10202

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

a958b7b

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to e7980672ba08 (47 revisions) flutter/packages#10204

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

5727e78

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to 54ac6899b6ba (48 revisions) flutter/packages#10205

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

339f139

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to fbfaf35e21d8 (49 revisions) flutter/packages#10207

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

6583a0a

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to 75caa52df10e (50 revisions) flutter/packages#10209

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 10, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

9fa84ea

…utter/flutter#175574)

engine-flutter-autoroll mentioned this pull request Oct 10, 2025

Roll Flutter from e11e2c11288b to cce24b8a9d3e (51 revisions) flutter/packages#10210

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 11, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

4680850

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 11, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

ea7f1b6

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

d90c410

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

b49e24c

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 12, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

6d5a7f3

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

ee1706b

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

a90222b

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 13, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

7b5cc62

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

3cec3dd

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

7072898

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

e0b0004

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

f602676

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

243dfca

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 14, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

5bd0705

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 15, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

ae4684d

…utter/flutter#175574)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 15, 2025

6e5d0079d Simplify if-else block into single return statement (fl…

075a593

…utter/flutter#175574)

Simplify if-else block into single return statement #175574

Simplify if-else block into single return statement #175574

Uh oh!

Conversation

ValentinVignal commented Sep 18, 2025

Pre-launch Checklist

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

ValentinVignal Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

victorsanni Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

ValentinVignal Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

gemini-code-assist bot Sep 18, 2025

Choose a reason for hiding this comment

Style Guide References

Footnotes

Uh oh!

victorsanni left a comment

Choose a reason for hiding this comment

Uh oh!

victorsanni Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

dkwingsmt left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Oct 7, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Simplify `if-else` block into single `return` statement #175574

Simplify `if-else` block into single `return` statement #175574