`flutter/lib/src/`: refactoring if-chains into switch expressions #147472

nate-thegrate · 2024-04-27T18:33:05Z

Based on issue #144903, this pull request aims to bring the codebase more in line with the Flutter repo style guide:

Avoid using if chains or ?: or == with enum values

// before
bool get shown {
  if (overlayEntry == null) {
    return false;
  }
  if (animationController != null) {
    return animationController!.status == AnimationStatus.completed ||
        animationController!.status == AnimationStatus.forward;
  }
  return true;
}


// after
bool get shown {
  return overlayEntry != null && switch (animationController?.status) {
    AnimationStatus.forward || AnimationStatus.completed || null => true,
    AnimationStatus.reverse || AnimationStatus.dismissed => false,
  };
}

This pull request is similar to a previous PR with the same name but has a bit more thorough refactoring overall.

goderbauer

LGTM

justinmc

LGTM 👍 Thanks for cleaning up the code as always.

@nate-thegrate Are you interested in getting contributor access by the way? I'd be happy to sponsor you. See https://github.com/flutter/flutter/wiki/Contributor-access.

justinmc · 2024-05-01T19:54:50Z

packages/flutter/lib/src/material/search_anchor.dart

                      ),
                    ),
-                    if (trailing != null) ...trailing,
+                    ...?trailing,


I didn't realize that was a thing 👍

nate-thegrate · 2024-05-02T01:12:43Z

@nate-thegrate Are you interested in getting contributor access by the way? I'd be happy to sponsor you.

@justinmc That would be awesome, thank you very much!

…ions (flutter/flutter#147472)

Roll Flutter from d33bb8f to bf7191f (34 revisions) flutter/flutter@d33bb8f...bf7191f 2024-05-02 [email protected] Roll Flutter Engine from b989d239e281 to 1fb36ac9d718 (2 revisions) (flutter/flutter#147713) 2024-05-02 [email protected] Roll Flutter Engine from 3c9c2ce8369e to b989d239e281 (1 revision) (flutter/flutter#147711) 2024-05-02 [email protected] Roll Flutter Engine from 58b031c096ea to 3c9c2ce8369e (2 revisions) (flutter/flutter#147703) 2024-05-02 [email protected] Roll Flutter Engine from fc28057dbd4d to 58b031c096ea (1 revision) (flutter/flutter#147701) 2024-05-02 [email protected] Roll Flutter Engine from bfc6787eedc3 to fc28057dbd4d (1 revision) (flutter/flutter#147700) 2024-05-02 [email protected] Roll Flutter Engine from 7cbef71f4f54 to bfc6787eedc3 (1 revision) (flutter/flutter#147699) 2024-05-02 [email protected] Roll Flutter Engine from 90ce9e5959fc to 7cbef71f4f54 (1 revision) (flutter/flutter#147696) 2024-05-02 [email protected] Roll Flutter Engine from 78dced50c467 to 90ce9e5959fc (1 revision) (flutter/flutter#147695) 2024-05-02 [email protected] add verbose logging to select hot reload/hot restart tests (flutter/flutter#147673) 2024-05-02 [email protected] Roll Flutter Engine from 3087ec1adddd to 78dced50c467 (3 revisions) (flutter/flutter#147693) 2024-05-02 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Implement computeDryBaseline for `RenderWrap` (#146260)" (flutter/flutter#147692) 2024-05-02 [email protected] Roll Flutter Engine from f56c20c6ac67 to 3087ec1adddd (2 revisions) (flutter/flutter#147688) 2024-05-02 [email protected] Allow explicit exclusion of packages from pinned packages in `flutter update-packages --force-update` (flutter/flutter#147679) 2024-05-02 [email protected] Implement getDryBaseline for Stack and Overlay (flutter/flutter#146253) 2024-05-02 [email protected] Roll Flutter Engine from 2d73fa207927 to f56c20c6ac67 (2 revisions) (flutter/flutter#147681) 2024-05-02 [email protected] Update selectable_text_test.dart (flutter/flutter#147677) 2024-05-01 [email protected] Roll Flutter Engine from c536a14052e5 to 2d73fa207927 (2 revisions) (flutter/flutter#147678) 2024-05-01 [email protected] Implement computeDryBaseline for `RenderWrap` (flutter/flutter#146260) 2024-05-01 [email protected] Roll Flutter Engine from 842cf254ec58 to c536a14052e5 (1 revision) (flutter/flutter#147675) 2024-05-01 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.3.0 to 4.3.1 (flutter/flutter#147674) 2024-05-01 [email protected] Remove obsolete performance analysis tools. (flutter/flutter#147663) 2024-05-01 [email protected] Roll Flutter Engine from 5129b4919434 to 842cf254ec58 (3 revisions) (flutter/flutter#147670) 2024-05-01 [email protected] fix DropdownMenu overflow (flutter/flutter#147233) 2024-05-01 [email protected] [web] remove platform_messages_integration test (flutter/flutter#147654) 2024-05-01 [email protected] Fix `TextField` horizontal drag conflicts (flutter/flutter#147341) 2024-05-01 [email protected] `flutter/lib/src/`: refactoring if-chains into switch expressions (flutter/flutter#147472) 2024-05-01 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Draggable feedback positioning (#145647)" (flutter/flutter#147658) 2024-05-01 [email protected] Roll Flutter Engine from 0014e0353aa9 to 5129b4919434 (1 revision) (flutter/flutter#147655) 2024-05-01 [email protected] add lang attribute to the a11y_assessments app (flutter/flutter#147586) 2024-05-01 [email protected] Draggable feedback positioning (flutter/flutter#145647) 2024-05-01 [email protected] Roll Flutter Engine from 0ce67714ce4c to 0014e0353aa9 (13 revisions) (flutter/flutter#147649) 2024-05-01 [email protected] Add test for animated_fractionally_sized_box.0.dart API example. (flutter/flutter#146721) 2024-05-01 [email protected] Roll Packages from cc47b06 to aea93d2 (5 revisions) (flutter/flutter#147647) 2024-05-01 [email protected] Update reorderable_list.dart to use Dart 3 return switch statement for consistency (flutter/flutter#147505) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 ...

Previous "if-chains" pull requests: - #144905 - #144977 - #145194 - #146293 - #147472 <br> I think this one should be enough to wrap things up! fixes #144903 --------- Co-authored-by: Victor Sanni <[email protected]>

Roll Flutter from d33bb8f to bf7191f (34 revisions) flutter/flutter@d33bb8f...bf7191f 2024-05-02 [email protected] Roll Flutter Engine from b989d239e281 to 1fb36ac9d718 (2 revisions) (flutter/flutter#147713) 2024-05-02 [email protected] Roll Flutter Engine from 3c9c2ce8369e to b989d239e281 (1 revision) (flutter/flutter#147711) 2024-05-02 [email protected] Roll Flutter Engine from 58b031c096ea to 3c9c2ce8369e (2 revisions) (flutter/flutter#147703) 2024-05-02 [email protected] Roll Flutter Engine from fc28057dbd4d to 58b031c096ea (1 revision) (flutter/flutter#147701) 2024-05-02 [email protected] Roll Flutter Engine from bfc6787eedc3 to fc28057dbd4d (1 revision) (flutter/flutter#147700) 2024-05-02 [email protected] Roll Flutter Engine from 7cbef71f4f54 to bfc6787eedc3 (1 revision) (flutter/flutter#147699) 2024-05-02 [email protected] Roll Flutter Engine from 90ce9e5959fc to 7cbef71f4f54 (1 revision) (flutter/flutter#147696) 2024-05-02 [email protected] Roll Flutter Engine from 78dced50c467 to 90ce9e5959fc (1 revision) (flutter/flutter#147695) 2024-05-02 [email protected] add verbose logging to select hot reload/hot restart tests (flutter/flutter#147673) 2024-05-02 [email protected] Roll Flutter Engine from 3087ec1adddd to 78dced50c467 (3 revisions) (flutter/flutter#147693) 2024-05-02 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Implement computeDryBaseline for `RenderWrap` (#146260)" (flutter/flutter#147692) 2024-05-02 [email protected] Roll Flutter Engine from f56c20c6ac67 to 3087ec1adddd (2 revisions) (flutter/flutter#147688) 2024-05-02 [email protected] Allow explicit exclusion of packages from pinned packages in `flutter update-packages --force-update` (flutter/flutter#147679) 2024-05-02 [email protected] Implement getDryBaseline for Stack and Overlay (flutter/flutter#146253) 2024-05-02 [email protected] Roll Flutter Engine from 2d73fa207927 to f56c20c6ac67 (2 revisions) (flutter/flutter#147681) 2024-05-02 [email protected] Update selectable_text_test.dart (flutter/flutter#147677) 2024-05-01 [email protected] Roll Flutter Engine from c536a14052e5 to 2d73fa207927 (2 revisions) (flutter/flutter#147678) 2024-05-01 [email protected] Implement computeDryBaseline for `RenderWrap` (flutter/flutter#146260) 2024-05-01 [email protected] Roll Flutter Engine from 842cf254ec58 to c536a14052e5 (1 revision) (flutter/flutter#147675) 2024-05-01 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.3.0 to 4.3.1 (flutter/flutter#147674) 2024-05-01 [email protected] Remove obsolete performance analysis tools. (flutter/flutter#147663) 2024-05-01 [email protected] Roll Flutter Engine from 5129b4919434 to 842cf254ec58 (3 revisions) (flutter/flutter#147670) 2024-05-01 [email protected] fix DropdownMenu overflow (flutter/flutter#147233) 2024-05-01 [email protected] [web] remove platform_messages_integration test (flutter/flutter#147654) 2024-05-01 [email protected] Fix `TextField` horizontal drag conflicts (flutter/flutter#147341) 2024-05-01 [email protected] `flutter/lib/src/`: refactoring if-chains into switch expressions (flutter/flutter#147472) 2024-05-01 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Draggable feedback positioning (#145647)" (flutter/flutter#147658) 2024-05-01 [email protected] Roll Flutter Engine from 0014e0353aa9 to 5129b4919434 (1 revision) (flutter/flutter#147655) 2024-05-01 [email protected] add lang attribute to the a11y_assessments app (flutter/flutter#147586) 2024-05-01 [email protected] Draggable feedback positioning (flutter/flutter#145647) 2024-05-01 [email protected] Roll Flutter Engine from 0ce67714ce4c to 0014e0353aa9 (13 revisions) (flutter/flutter#147649) 2024-05-01 [email protected] Add test for animated_fractionally_sized_box.0.dart API example. (flutter/flutter#146721) 2024-05-01 [email protected] Roll Packages from cc47b06 to aea93d2 (5 revisions) (flutter/flutter#147647) 2024-05-01 [email protected] Update reorderable_list.dart to use Dart 3 return switch statement for consistency (flutter/flutter#147505) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 ...

…ions (flutter/flutter#147472)

nate-thegrate added 3 commits April 27, 2024 00:52

implement switch expressions

8f892f4

revert non-lib/src/ changes

4344130

refactor widget_inspector.dart

14f6b88

nate-thegrate added 5 commits April 27, 2024 12:53

switch to EdgeInsetsGeometry

2beed07

fix ToggleButtons verticalDirection

2ea932d

revert toggle_buttons.dart

5a9a07d

grammar fix

0c42001

hopefully that's all the grammar

4745273

nate-thegrate marked this pull request as ready for review April 27, 2024 23:23

nate-thegrate added 2 commits April 27, 2024 18:15

update list_tile.dart

b506bd1

revert grammar

f8aa065

goderbauer approved these changes Apr 29, 2024

View reviewed changes

justinmc approved these changes May 1, 2024

View reviewed changes

justinmc merged commit 586e1fc into flutter:master May 1, 2024

nate-thegrate deleted the lib-src-if-chains branch May 2, 2024 00:55

engine-flutter-autoroll mentioned this pull request May 2, 2024

Roll Flutter from d33bb8fa5eb8 to bf7191fd3884 (34 revisions) flutter/packages#6637

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 2, 2024

586e1fc flutter/lib/src/: refactoring if-chains into switch express…

138238c

…ions (flutter/flutter#147472)

nate-thegrate mentioned this pull request May 3, 2024

if chains → switch expressions #147793

Merged

nate-thegrate added the refactor Improving readability/efficiency without behavioral changes label Jul 12, 2024

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 6, 2024

586e1fc flutter/lib/src/: refactoring if-chains into switch express…

4fcf243

…ions (flutter/flutter#147472)

nate-thegrate added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 12, 2024

TahaTesser mentioned this pull request Sep 23, 2024

TabBar ignores Theme's iconTheme.size #155518

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

`flutter/lib/src/`: refactoring if-chains into switch expressions #147472

`flutter/lib/src/`: refactoring if-chains into switch expressions #147472

Uh oh!

nate-thegrate commented Apr 27, 2024

Uh oh!

goderbauer left a comment

Uh oh!

justinmc left a comment

Uh oh!

justinmc May 1, 2024

Uh oh!

nate-thegrate commented May 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

flutter/lib/src/: refactoring if-chains into switch expressions #147472

flutter/lib/src/: refactoring if-chains into switch expressions #147472

Uh oh!

Conversation

nate-thegrate commented Apr 27, 2024

Avoid using if chains or ?: or == with enum values

Uh oh!

goderbauer left a comment

Choose a reason for hiding this comment

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

justinmc May 1, 2024

Choose a reason for hiding this comment

Uh oh!

nate-thegrate commented May 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

`flutter/lib/src/`: refactoring if-chains into switch expressions #147472

`flutter/lib/src/`: refactoring if-chains into switch expressions #147472

Avoid using `if` chains or `?:` or `==` with enum values