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

nate-thegrate · 2024-04-04T17:38:10Z

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

goderbauer

LGTM

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

Co-authored-by: Michael Goderbauer <goderbauer@google.com>

Piinks

Thank you!

QuncCccccc

LGTM! Thanks a lot for your contribution:)!

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

…ions (flutter/flutter#146293)

flutter/flutter@77043ba...dba4f77 2024-04-24 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in `BottomNavigationBar` (flutter/flutter#147213) 2024-04-24 32538273+ValentinVignal@users.noreply.github.com Disable leak tracking for selection text area (flutter/flutter#147273) 2024-04-24 tessertaha@gmail.com Add missing `overlayColor` property in `styleFrom` methods (flutter/flutter#146685) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3d91141e7e18 to b5d5832f7144 (1 revision) (flutter/flutter#147293) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from d4f63383d329 to 3d91141e7e18 (1 revision) (flutter/flutter#147281) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from fcb106011371 to d4f63383d329 (1 revision) (flutter/flutter#147276) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7f89b4367338 to fcb106011371 (1 revision) (flutter/flutter#147272) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9819627013f7 to 7f89b4367338 (2 revisions) (flutter/flutter#147270) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from d56a231cddc2 to 9819627013f7 (3 revisions) (flutter/flutter#147267) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5f17a779f19d to d56a231cddc2 (1 revision) (flutter/flutter#147266) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 303e71890897 to 5f17a779f19d (1 revision) (flutter/flutter#147264) 2024-04-23 72562119+tgucio@users.noreply.github.com Remove unneeded local variables and comments in Editable and RenderParagraph (flutter/flutter#146843) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for sliver_animated_opacity.0.dart API example. (flutter/flutter#146722) 2024-04-23 50643541+Mairramer@users.noreply.github.com Adds AutovalidateMode.onFocusChange to Form and FormField (flutter/flutter#140962) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from b686508a1dbf to 303e71890897 (4 revisions) (flutter/flutter#147262) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from f23cc4dda1ad to b686508a1dbf (4 revisions) (flutter/flutter#147258) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for focus_node.0.dart API example. (flutter/flutter#146943) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 066953b74042 to f23cc4dda1ad (3 revisions) (flutter/flutter#147255) 2024-04-23 103135467+sealesj@users.noreply.github.com Refactor framework + test harness tests (flutter/flutter#146213) 2024-04-23 tessertaha@gmail.com Fix chips delete icon override the default icon size and ignores `IconTheme` from the chip property and `ChipThemeData` (flutter/flutter#146509) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from f794e6719d3c to 066953b74042 (3 revisions) (flutter/flutter#147248) 2024-04-23 82336674+gilnobrega@users.noreply.github.com Fix frozen `StretchingOverscrollIndicator` animation (flutter/flutter#147195) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for animated_align.0.dart API example. (flutter/flutter#146719) 2024-04-23 choi88andys@gmail.com Fix typos related to Navigator (flutter/flutter#147221) 2024-04-23 32538273+ValentinVignal@users.noreply.github.com Fix memory leak in switch painter (flutter/flutter#147228) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for animated_positioned.0.dart API example. (flutter/flutter#146720) 2024-04-23 katelovett@google.com Update icon tree shaker to allow system font fallback (flutter/flutter#147202) 2024-04-23 nate.w5687@gmail.com `flutter/lib/src/`: refactoring if-chains into switch expressions (flutter/flutter#146293) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 79f49954cce8 to f794e6719d3c (1 revision) (flutter/flutter#147241) 2024-04-23 engine-flutter-autoroll@skia.org Roll Packages from 01a32c4 to cf6d280 (5 revisions) (flutter/flutter#147240) 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 camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com 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 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

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 <victorsanniay@gmail.com>

flutter/flutter@77043ba...dba4f77 2024-04-24 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in `BottomNavigationBar` (flutter/flutter#147213) 2024-04-24 32538273+ValentinVignal@users.noreply.github.com Disable leak tracking for selection text area (flutter/flutter#147273) 2024-04-24 tessertaha@gmail.com Add missing `overlayColor` property in `styleFrom` methods (flutter/flutter#146685) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 3d91141e7e18 to b5d5832f7144 (1 revision) (flutter/flutter#147293) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from d4f63383d329 to 3d91141e7e18 (1 revision) (flutter/flutter#147281) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from fcb106011371 to d4f63383d329 (1 revision) (flutter/flutter#147276) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7f89b4367338 to fcb106011371 (1 revision) (flutter/flutter#147272) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9819627013f7 to 7f89b4367338 (2 revisions) (flutter/flutter#147270) 2024-04-24 engine-flutter-autoroll@skia.org Roll Flutter Engine from d56a231cddc2 to 9819627013f7 (3 revisions) (flutter/flutter#147267) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5f17a779f19d to d56a231cddc2 (1 revision) (flutter/flutter#147266) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 303e71890897 to 5f17a779f19d (1 revision) (flutter/flutter#147264) 2024-04-23 72562119+tgucio@users.noreply.github.com Remove unneeded local variables and comments in Editable and RenderParagraph (flutter/flutter#146843) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for sliver_animated_opacity.0.dart API example. (flutter/flutter#146722) 2024-04-23 50643541+Mairramer@users.noreply.github.com Adds AutovalidateMode.onFocusChange to Form and FormField (flutter/flutter#140962) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from b686508a1dbf to 303e71890897 (4 revisions) (flutter/flutter#147262) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from f23cc4dda1ad to b686508a1dbf (4 revisions) (flutter/flutter#147258) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for focus_node.0.dart API example. (flutter/flutter#146943) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 066953b74042 to f23cc4dda1ad (3 revisions) (flutter/flutter#147255) 2024-04-23 103135467+sealesj@users.noreply.github.com Refactor framework + test harness tests (flutter/flutter#146213) 2024-04-23 tessertaha@gmail.com Fix chips delete icon override the default icon size and ignores `IconTheme` from the chip property and `ChipThemeData` (flutter/flutter#146509) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from f794e6719d3c to 066953b74042 (3 revisions) (flutter/flutter#147248) 2024-04-23 82336674+gilnobrega@users.noreply.github.com Fix frozen `StretchingOverscrollIndicator` animation (flutter/flutter#147195) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for animated_align.0.dart API example. (flutter/flutter#146719) 2024-04-23 choi88andys@gmail.com Fix typos related to Navigator (flutter/flutter#147221) 2024-04-23 32538273+ValentinVignal@users.noreply.github.com Fix memory leak in switch painter (flutter/flutter#147228) 2024-04-23 sokolovskyi.konstantin@gmail.com Add test for animated_positioned.0.dart API example. (flutter/flutter#146720) 2024-04-23 katelovett@google.com Update icon tree shaker to allow system font fallback (flutter/flutter#147202) 2024-04-23 nate.w5687@gmail.com `flutter/lib/src/`: refactoring if-chains into switch expressions (flutter/flutter#146293) 2024-04-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 79f49954cce8 to f794e6719d3c (1 revision) (flutter/flutter#147241) 2024-04-23 engine-flutter-autoroll@skia.org Roll Packages from 01a32c4 to cf6d280 (5 revisions) (flutter/flutter#147240) 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 camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com 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 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

@OverRide

fixes [TabBar with isScrollable set to true is broken](#150000) This regressed due to a tiny mistake in #146293 ### Code sample <details> <summary>expand to view the code sample</summary> ```dart import 'dart:ui'; import 'package:flutter/material.dart'; /// Flutter code sample for [TabBar]. void main() => runApp(const TabBarApp()); class TabBarApp extends StatelessWidget { const TabBarApp({super.key}); @OverRide Widget build(BuildContext context) { return const MaterialApp( home: TabBarExample(), ); } } class TabBarExample extends StatelessWidget { const TabBarExample({super.key}); @OverRide Widget build(BuildContext context) { final List<Tab> tabs = List<Tab>.generate(20, (int index) => Tab(text: 'Tab $index')); return ScrollConfiguration( behavior: ScrollConfiguration.of(context) .copyWith(dragDevices: <PointerDeviceKind>{ PointerDeviceKind.touch, PointerDeviceKind.mouse, }), child: DefaultTabController( length: tabs.length, child: Scaffold( appBar: AppBar( title: const Text('TabBar Sample'), bottom: TabBar( isScrollable: true, tabs: tabs, tabAlignment: TabAlignment.start, ), ), body: TabBarView( children: <Widget>[ for (int i = 0; i < tabs.length; i++) Center( child: Text('Page $i'), ), ], ), ), ), ); } } ``` </details> ### Before https://github.com/flutter/flutter/assets/48603081/b7aa98a2-a6a5-431e-8327-859a11efa129 ### After https://github.com/flutter/flutter/assets/48603081/0435719f-03d4-4d76-8b5a-532894fcf4a3

…ions (flutter/flutter#146293)

implement switch expressions

b650c01

nate-thegrate added 3 commits April 4, 2024 12:28

revert _platform_io.dart

db3c77d

revert calendar_date_picker.dart

c08c25f

revert navigator.dart

d8d388b

github-actions bot removed the f: routes Navigator, Router, and related APIs. label Apr 4, 2024

re-implement calendar_date_picker.dart

4e8a6bc

nate-thegrate marked this pull request as ready for review April 5, 2024 00:12

goderbauer approved these changes Apr 8, 2024

View reviewed changes

packages/flutter/lib/src/material/mergeable_material.dart Outdated Show resolved Hide resolved

nate-thegrate and others added 2 commits April 9, 2024 10:39

apply suggestion from code review

4106a0e

Co-authored-by: Michael Goderbauer <goderbauer@google.com>

Merge github.com:flutter/flutter into lib-src-if-chains

3ac8018

Piinks approved these changes Apr 23, 2024

View reviewed changes

Piinks added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 23, 2024

QuncCccccc approved these changes Apr 23, 2024

View reviewed changes

packages/flutter/lib/src/material/input_decorator.dart Show resolved Hide resolved

auto-submit bot merged commit a83e111 into flutter:master Apr 23, 2024

nate-thegrate deleted the lib-src-if-chains branch April 23, 2024 16:38

engine-flutter-autoroll mentioned this pull request Apr 24, 2024

Roll Flutter from 77043bae1a5e to fa85f69e47d8 (28 revisions) flutter/packages#6604

Closed

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

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

d3d5e1c

…ions (flutter/flutter#146293)

engine-flutter-autoroll mentioned this pull request Apr 24, 2024

Roll Flutter from 77043bae1a5e to 2676c84a90d2 (29 revisions) flutter/packages#6606

Closed

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

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

706ad0f

…ions (flutter/flutter#146293)

engine-flutter-autoroll mentioned this pull request Apr 24, 2024

Roll Flutter from 77043bae1a5e to dba4f7747441 (30 revisions) flutter/packages#6607

Merged

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

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

6dcf6dd

…ions (flutter/flutter#146293)

HansMuller mentioned this pull request Apr 26, 2024

Flutter Framework Team: Notable Commits #121415

Closed

This was referenced Apr 27, 2024

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

Merged

if chains → switch expressions #147793

Merged

This was referenced Jun 11, 2024

TabBar with isScrollable set to true is broken #150000

Closed

Fix scrollable TabBar jittering #150041

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

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

9d38ff8

…ions (flutter/flutter#146293)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

nate-thegrate commented Apr 4, 2024

Uh oh!

goderbauer left a comment

Uh oh!

Uh oh!

Piinks left a comment

Uh oh!

QuncCccccc left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

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

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

Uh oh!

Conversation

nate-thegrate commented Apr 4, 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!

Uh oh!

Piinks left a comment

Choose a reason for hiding this comment

Uh oh!

QuncCccccc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

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

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

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