Tiny cleanup for Navigator code (without introducing dependency) by fzyzcjy · Pull Request #125628 · flutter/flutter

fzyzcjy · 2023-04-27T13:03:34Z

The navigator.dart has ~10 repeats of things like:

    final _RouteEntry? currentRouteEntry = _navigator!._history.cast<_RouteEntry?>().lastWhere(
      (_RouteEntry? e) => e != null && _RouteEntry.isPresentPredicate(e),
      orElse: () => null,
    );

while it can be greatly simplified as:

    final _RouteEntry? currentRouteEntry = _navigator!._history.lastWhereOrNull(_RouteEntry.isPresentPredicate);

Thus, it seems that we can beautify the code a little bit.

Same as #125099, but without external dependency

For more detailed explanation why it does not introduce external dependency: #125099 (comment)

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.
All existing and new tests are passing.

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

flutter-dashboard · 2023-04-27T13:03:38Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Piinks · 2023-04-27T18:25:01Z

Hey @fzyzcjy is there an issue this is resolving? Can you update the description of the PR with an explanation of what this change is doing?

fzyzcjy · 2023-04-27T23:16:12Z

@Piinks Hi, it is solving the same issue as #125099 mentions. The former issue was closed because hixie thought that the external dependency should not be introduced, hence this PR.

Piinks · 2023-04-28T14:43:05Z

it is solving the same issue as #125099 mentions.

Can you update the PR description to link to the issue and explain the fix? Having to backtrack through other PRs and issues is difficult to follow. :)

Hixie · 2023-04-28T17:28:10Z

test-exempt: refactor (in case the test is removed)

fzyzcjy · 2023-04-28T23:48:55Z

@Piinks Done

…t/cleanup-navigator

fzyzcjy · 2023-05-05T07:24:14Z

@chunhtai done

chunhtai

LGTM

Co-authored-by: chunhtai <[email protected]>

Piinks

LGTM thank you!

…cy) (flutter/flutter#125628)

flutter/flutter@4ed1c92...8c5a1ea 2023-05-08 [email protected] tool/web: tiniest tweak to wasm help content (flutter/flutter#126284) 2023-05-08 [email protected] Roll Flutter Engine from d9184ce4ffa0 to 8d3a8162b3ab (7 revisions) (flutter/flutter#126288) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Improve the format in `asset_bundle.dart` (flutter/flutter#126229) 2023-05-08 [email protected] Tiny cleanup for Navigator code (without introducing dependency) (flutter/flutter#125628) 2023-05-08 [email protected] [Refactor] Fix style in example (flutter/flutter#126191) 2023-05-08 [email protected] Roll Flutter Engine from a8e9ac63fd95 to d9184ce4ffa0 (2 revisions) (flutter/flutter#126279) 2023-05-08 [email protected] [Tool] Output help on 'flutter pub' (flutter/flutter#126211) 2023-05-08 [email protected] Always use `--concurrency=1` for web tests. (flutter/flutter#126179) 2023-05-08 [email protected] Add `--verbose` flags for flakey tests (flutter/flutter#126162) 2023-05-08 [email protected] Roll Packages from a0f8fd8 to 4800d65 (2 revisions) (flutter/flutter#126269) 2023-05-08 [email protected] Test AGP 8.0 using java 17 (flutter/flutter#125323) 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…cy) (flutter/flutter#125628)

flutter/flutter@4ed1c92...8c5a1ea 2023-05-08 [email protected] tool/web: tiniest tweak to wasm help content (flutter/flutter#126284) 2023-05-08 [email protected] Roll Flutter Engine from d9184ce4ffa0 to 8d3a8162b3ab (7 revisions) (flutter/flutter#126288) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Improve the format in `asset_bundle.dart` (flutter/flutter#126229) 2023-05-08 [email protected] Tiny cleanup for Navigator code (without introducing dependency) (flutter/flutter#125628) 2023-05-08 [email protected] [Refactor] Fix style in example (flutter/flutter#126191) 2023-05-08 [email protected] Roll Flutter Engine from a8e9ac63fd95 to d9184ce4ffa0 (2 revisions) (flutter/flutter#126279) 2023-05-08 [email protected] [Tool] Output help on 'flutter pub' (flutter/flutter#126211) 2023-05-08 [email protected] Always use `--concurrency=1` for web tests. (flutter/flutter#126179) 2023-05-08 [email protected] Add `--verbose` flags for flakey tests (flutter/flutter#126162) 2023-05-08 [email protected] Roll Packages from a0f8fd8 to 4800d65 (2 revisions) (flutter/flutter#126269) 2023-05-08 [email protected] Test AGP 8.0 using java 17 (flutter/flutter#125323) 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

flutter/flutter@4ed1c92...8c5a1ea 2023-05-08 [email protected] tool/web: tiniest tweak to wasm help content (flutter/flutter#126284) 2023-05-08 [email protected] Roll Flutter Engine from d9184ce4ffa0 to 8d3a8162b3ab (7 revisions) (flutter/flutter#126288) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Fix that `flutter test` does not understand `concurrency` (flutter/flutter#125942) 2023-05-08 [email protected] Improve the format in `asset_bundle.dart` (flutter/flutter#126229) 2023-05-08 [email protected] Tiny cleanup for Navigator code (without introducing dependency) (flutter/flutter#125628) 2023-05-08 [email protected] [Refactor] Fix style in example (flutter/flutter#126191) 2023-05-08 [email protected] Roll Flutter Engine from a8e9ac63fd95 to d9184ce4ffa0 (2 revisions) (flutter/flutter#126279) 2023-05-08 [email protected] [Tool] Output help on 'flutter pub' (flutter/flutter#126211) 2023-05-08 [email protected] Always use `--concurrency=1` for web tests. (flutter/flutter#126179) 2023-05-08 [email protected] Add `--verbose` flags for flakey tests (flutter/flutter#126162) 2023-05-08 [email protected] Roll Packages from 7bce9f6 to bae1300 (2 revisions) (flutter/flutter#126269) 2023-05-08 [email protected] Test AGP 8.0 using java 17 (flutter/flutter#125323) 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

fzyzcjy added 2 commits April 27, 2023 21:00

copy old code

1cb2749

avoid external dep

0079d60

flutter-dashboard Bot added f: routes Navigator, Router, and related APIs. framework flutter/packages/flutter repository. See also f: labels. labels Apr 27, 2023

Piinks requested a review from chunhtai April 27, 2023 18:23

chunhtai reviewed Apr 27, 2023

View reviewed changes

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

fzyzcjy and others added 3 commits April 28, 2023 07:48

avoid extension

5194d9f

add tests

f805a4c

Merge branch 'master' into feat/cleanup-navigator

8e2acb8

chunhtai reviewed Apr 28, 2023

View reviewed changes

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

fzyzcjy and others added 6 commits April 29, 2023 07:51

Merge branch 'master' into feat/cleanup-navigator

f138101

Merge branch 'master' into feat/cleanup-navigator

0f8c729

remove tests

2370945

Merge remote-tracking branch 'origin/feat/cleanup-navigator' into fea…

ad4ecd5

…t/cleanup-navigator

refactor

cb4d808

typedef

50fc24d

chunhtai approved these changes May 5, 2023

View reviewed changes

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

Comment thread packages/flutter/lib/src/widgets/navigator.dart Outdated

fzyzcjy and others added 4 commits May 6, 2023 07:34

Merge branch 'master' into feat/cleanup-navigator

6a542b2

Update packages/flutter/lib/src/widgets/navigator.dart

81d4397

Co-authored-by: chunhtai <[email protected]>

Update packages/flutter/lib/src/widgets/navigator.dart

94b4fe3

Co-authored-by: chunhtai <[email protected]>

Update navigator.dart

75f3d26

Piinks approved these changes May 8, 2023

View reviewed changes

Piinks added the autosubmit Merge PR when tree becomes green via auto submit App label May 8, 2023

auto-submit Bot merged commit 431dfc8 into flutter:master May 8, 2023

engine-flutter-autoroll mentioned this pull request May 9, 2023

Roll Flutter from 4ed1c9230310 to 8c5a1ea7281a (13 revisions) flutter/packages#3949

Merged

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

431dfc8 Tiny cleanup for Navigator code (without introducing dependen…

13fe5cd

…cy) (flutter/flutter#125628)

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

431dfc8 Tiny cleanup for Navigator code (without introducing dependen…

49d6648

…cy) (flutter/flutter#125628)

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

431dfc8 Tiny cleanup for Navigator code (without introducing dependen…

2a35116

…cy) (flutter/flutter#125628)

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

431dfc8 Tiny cleanup for Navigator code (without introducing dependen…

c5a664a

…cy) (flutter/flutter#125628)

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

431dfc8 Tiny cleanup for Navigator code (without introducing dependen…

291aae3

…cy) (flutter/flutter#125628)

Navigation Menu

Repository navigation

Tiny cleanup for Navigator code (without introducing dependency) - #125628

Tiny cleanup for Navigator code (without introducing dependency)#125628
auto-submit[bot] merged 15 commits into
flutter:masterfrom
fzyzcjy:feat/cleanup-navigator

fzyzcjy commented Apr 27, 2023 •

edited

Loading

Uh oh!

flutter-dashboard Bot commented Apr 27, 2023

Uh oh!

Piinks commented Apr 27, 2023

Uh oh!

fzyzcjy commented Apr 27, 2023

Uh oh!

Uh oh!

Piinks commented Apr 28, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hixie commented Apr 28, 2023

Uh oh!

fzyzcjy commented Apr 28, 2023

Uh oh!

fzyzcjy commented May 5, 2023

Uh oh!

chunhtai left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Piinks left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

fzyzcjy commented Apr 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

flutter-dashboard Bot commented Apr 27, 2023

Uh oh!

Piinks commented Apr 27, 2023

Uh oh!

fzyzcjy commented Apr 27, 2023

Uh oh!

Uh oh!

Piinks commented Apr 28, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hixie commented Apr 28, 2023

Uh oh!

fzyzcjy commented Apr 28, 2023

Uh oh!

fzyzcjy commented May 5, 2023

Uh oh!

chunhtai left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Piinks left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fzyzcjy commented Apr 27, 2023 •

edited

Loading