Implementing null-aware operators throughout the repository #143804

nate-thegrate · 2024-02-21T00:58:07Z

This pull request fixes #143803 by taking advantage of Dart's null-aware operators.

And unlike switch expressions (9 PRs and counting), the Flutter codebase is already fantastic when it comes to null-aware coding. After refactoring the entire repo, all the changes involving ?. and ?? can fit into a single pull request.

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.

justinmc

LGTM 👍. 200+ lines saved! Thanks for all of these code migrations. Out of curiosity are you using scripts or regexes or something to help do this?

justinmc · 2024-02-23T00:32:00Z

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

-      return box.size.width;
-    }
-    return _kWidth; // drawer not being shown currently
+    // set to _kWidth if drawer not being shown currently


Nit: "Return _kWidth if drawer not being shown currently."

justinmc · 2024-02-23T00:38:36Z

packages/flutter_tools/lib/src/commands/packages.dart

-
-    return rootProject.android.getEmbeddingVersion().toString().split('.').last;
-  })();
+  late final String? _androidEmbeddingVersion = _rootProject?.android.getEmbeddingVersion().toString().split('.').last;


I really wonder why this was done in a self calling function in the first place... Maybe just to limit the scope of the variables?

nate-thegrate · 2024-02-23T01:21:58Z

LGTM 👍. 200+ lines saved! Thanks for all of these code migrations. Out of curiosity are you using scripts or regexes or something to help do this?

Thanks very much! I've just been using VS Code's built-in regex search to look for potential stuff to improve.
For this PR it was == null or != null with something being assigned or returned in the next line.

justinmc · 2024-02-23T18:27:35Z

Ah got it. Maybe at some point we can add analyzer/lint rules for stuff like this.

goderbauer

LGTM

Juliotati · 2024-02-24T09:09:24Z

BEAUTIFUL

…lutter/flutter#143804)

flutter/flutter@39585e6...f6c1082 2024-02-24 [email protected] Roll Flutter Engine from 81035b7d56ef to 1d7d5e613d7e (1 revision) (flutter/flutter#144085) 2024-02-24 [email protected] Roll Flutter Engine from a148bdb63740 to 81035b7d56ef (2 revisions) (flutter/flutter#144083) 2024-02-24 [email protected] Roll Flutter Engine from 3c036c081534 to a148bdb63740 (1 revision) (flutter/flutter#144077) 2024-02-24 [email protected] Roll Flutter Engine from 738042295f97 to 3c036c081534 (2 revisions) (flutter/flutter#144073) 2024-02-24 [email protected] Roll Flutter Engine from ca2452074a49 to 738042295f97 (4 revisions) (flutter/flutter#144071) 2024-02-24 [email protected] Roll Flutter Engine from 9409b75e8f35 to ca2452074a49 (2 revisions) (flutter/flutter#144068) 2024-02-24 [email protected] Adding support for DDC modules when running Flutter Web in debug mode (flutter/flutter#141423) 2024-02-24 [email protected] Roll Flutter Engine from 733163c4e5d7 to 9409b75e8f35 (1 revision) (flutter/flutter#144061) 2024-02-23 [email protected] allow optional direct injection of Config instance into DevFS (flutter/flutter#144002) 2024-02-23 [email protected] Enable asset transformation for `flutter build` for iOS, Android, Windows, MacOS, Linux, and web (also `flutter run` without hot reload support) (flutter/flutter#143815) 2024-02-23 [email protected] Roll Flutter Engine from 5d1c0d4dc327 to 733163c4e5d7 (1 revision) (flutter/flutter#144058) 2024-02-23 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.4 to 3.24.5 (flutter/flutter#144059) 2024-02-23 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.0.1 to 4.0.2 (flutter/flutter#144060) 2024-02-23 [email protected] Render the warm up frame in a proper rendering process (flutter/flutter#143290) 2024-02-23 [email protected] Roll Flutter Engine from fbc9b889aee9 to 5d1c0d4dc327 (2 revisions) (flutter/flutter#144049) 2024-02-23 [email protected] Roll Flutter Engine from b5bebfe43d29 to fbc9b889aee9 (3 revisions) (flutter/flutter#144041) 2024-02-23 [email protected] disable debug banner in m3 page test apps. (flutter/flutter#143857) 2024-02-23 [email protected] Relands "Changing `TextPainter.getOffsetForCaret` implementation to remove the logarithmic search (#143281)" (reverted in #143801) (flutter/flutter#143954) 2024-02-23 [email protected] Roll Flutter Engine from 5f99a6c3289e to b5bebfe43d29 (1 revision) (flutter/flutter#144035) 2024-02-23 [email protected] Implementing null-aware operators throughout the repository (flutter/flutter#143804) 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 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…lutter/flutter#143804)

Hopefully soon, [flutter.dev/go/dart-patterns](https://flutter.dev/go/dart-patterns) will have lots of good feedback; in the meantime, I'll focus refactoring efforts on uncontroversial things :) Previously, I was under the impression that I could solve issue #143803 with [just 1 PR](#143804). It turns out that I had overlooked quite a bit! <br> ```dart // before if (chunkEvents != null) { chunkEvents.listen((ImageChunkEvent event) { reportImageChunkEvent(event); }, ); } // after chunkEvents?.listen(reportImageChunkEvent); ```

Hopefully soon, [flutter.dev/go/dart-patterns](https://flutter.dev/go/dart-patterns) will have lots of good feedback; in the meantime, I'll focus refactoring efforts on uncontroversial things :) Previously, I was under the impression that I could solve issue flutter#143803 with [just 1 PR](flutter#143804). It turns out that I had overlooked quite a bit! <br> ```dart // before if (chunkEvents != null) { chunkEvents.listen((ImageChunkEvent event) { reportImageChunkEvent(event); }, ); } // after chunkEvents?.listen(reportImageChunkEvent); ```

nate-thegrate added 16 commits February 18, 2024 17:49

implement some changes in dev/

512d3af

lib/src/ changes

331db9c

update diagnostics.dart

d25fddd

update lib/src/ files

2e12cfa

update drawer.dart

70f856d

multiple files in flutter/lib/src/

997d0bb

update lib/src/widgets/ files

62ef84b

update flutter/test/ files

4ed82bb

update binding test

35aa37e

update cache.dart

1a7cdaa

update files in flutter_tools/

6d482d8

update more flutter_tools/ files

69605d7

better _androidEmbeddingVersion initialization

06b5848

finish up with flutter_tools/

d37c9e5

revert unrelated changes

a7e51f6

reduce diffs

95478ac

nate-thegrate added 2 commits February 20, 2024 18:03

add parens ()

c3725d3

revert a change in selectable_region.dart

920cc3f

nate-thegrate marked this pull request as ready for review February 21, 2024 02:36

justinmc approved these changes Feb 23, 2024

View reviewed changes

nate-thegrate added 2 commits February 22, 2024 18:08

implement @justinmc's suggestion

a4a3e69

use arrow syntax for single-line stuff =>

eb52cd9

nate-thegrate added 2 commits February 22, 2024 18:29

revert setter change

b646837

Merge branch 'master' into null-aware-operators

6da2b79

goderbauer approved these changes Feb 23, 2024

View reviewed changes

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

auto-submit bot merged commit c53a18f into flutter:master Feb 23, 2024

nate-thegrate deleted the null-aware-operators branch February 23, 2024 19:03

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

Roll Flutter from 39585e66c11f to f6c10820fa30 (20 revisions) flutter/packages#6200

Merged

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

c53a18f Implementing null-aware operators throughout the repository (f…

e8760c6

…lutter/flutter#143804)

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

c53a18f Implementing null-aware operators throughout the repository (f…

2471de4

…lutter/flutter#143804)

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

nate-thegrate mentioned this pull request Jul 25, 2024

Implementing null-aware logic in /packages/flutter/ #152294

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implementing null-aware operators throughout the repository #143804

Implementing null-aware operators throughout the repository #143804

Uh oh!

nate-thegrate commented Feb 21, 2024

Uh oh!

justinmc left a comment

Uh oh!

justinmc Feb 23, 2024

Uh oh!

justinmc Feb 23, 2024

Uh oh!

nate-thegrate commented Feb 23, 2024

Uh oh!

justinmc commented Feb 23, 2024

Uh oh!

goderbauer left a comment

Uh oh!

Juliotati commented Feb 24, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Implementing null-aware operators throughout the repository #143804

Implementing null-aware operators throughout the repository #143804

Uh oh!

Conversation

nate-thegrate commented Feb 21, 2024

Pre-launch Checklist

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

justinmc Feb 23, 2024

Choose a reason for hiding this comment

Uh oh!

justinmc Feb 23, 2024

Choose a reason for hiding this comment

Uh oh!

nate-thegrate commented Feb 23, 2024

Uh oh!

justinmc commented Feb 23, 2024

Uh oh!

goderbauer left a comment

Choose a reason for hiding this comment

Uh oh!

Juliotati commented Feb 24, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants