From 458917d94d48a9f4400abb2feebf3442dfb1b8ba Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 30 Apr 2024 14:06:49 -0700 Subject: [PATCH 1/2] [go_router_builder] Tweaks for latest analyzer-6.5.0 --- packages/go_router_builder/CHANGELOG.md | 5 +++++ packages/go_router_builder/lib/src/type_helpers.dart | 4 ++-- packages/go_router_builder/pubspec.yaml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/go_router_builder/CHANGELOG.md b/packages/go_router_builder/CHANGELOG.md index e4ea9f6782c..2a490e34200 100644 --- a/packages/go_router_builder/CHANGELOG.md +++ b/packages/go_router_builder/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.6.1 + +* Fixes typo in `durationDecoderHelperName`. +* Updates development dependency to `dart_style-2.3.6` (compatible with `analyzer-6.5.0`). + ## 2.6.0 * Adds support for passing observers to the StatefulShellBranch for the nested Navigator. diff --git a/packages/go_router_builder/lib/src/type_helpers.dart b/packages/go_router_builder/lib/src/type_helpers.dart index a22edc8310d..7b594f96e1c 100644 --- a/packages/go_router_builder/lib/src/type_helpers.dart +++ b/packages/go_router_builder/lib/src/type_helpers.dart @@ -16,7 +16,7 @@ const String convertMapValueHelperName = r'_$convertMapValue'; /// The name of the generated, private helper for converting [Duration] to /// [bool]. -const String durationDecoderHelperName = r'_$duractionConverter'; +const String durationDecoderHelperName = r'_$durationConverter'; /// The name of the generated, private helper for converting [String] to [Enum]. const String enumExtensionHelperName = r'_$fromName'; @@ -91,7 +91,7 @@ String enumMapName(InterfaceType type) => '_\$${type.element.name}EnumMap'; String _stateValueAccess(ParameterElement element, Set pathParameters) { if (element.isExtraField) { - return 'extra as ${element.type.getDisplayString(withNullability: true)}'; + return 'extra as ${element.type.getDisplayString()}'; } late String access; diff --git a/packages/go_router_builder/pubspec.yaml b/packages/go_router_builder/pubspec.yaml index c5a656334ff..c64c3341243 100644 --- a/packages/go_router_builder/pubspec.yaml +++ b/packages/go_router_builder/pubspec.yaml @@ -2,7 +2,7 @@ name: go_router_builder description: >- A builder that supports generated strongly-typed route helpers for package:go_router -version: 2.6.0 +version: 2.6.1 repository: https://github.com/flutter/packages/tree/main/packages/go_router_builder issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router_builder%22 @@ -23,7 +23,7 @@ dependencies: dev_dependencies: build_test: ^2.1.7 - dart_style: 2.3.2 + dart_style: 2.3.6 flutter: sdk: flutter go_router: ^10.0.0 From 8b2af762b40b81569358e084955bb9e918013901 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Tue, 30 Apr 2024 14:18:00 -0700 Subject: [PATCH 2/2] Ignores withNullability default value, because analyzer is flip-flopping between resolved versions. --- packages/go_router_builder/lib/src/type_helpers.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/go_router_builder/lib/src/type_helpers.dart b/packages/go_router_builder/lib/src/type_helpers.dart index 7b594f96e1c..94ddcd0a6e7 100644 --- a/packages/go_router_builder/lib/src/type_helpers.dart +++ b/packages/go_router_builder/lib/src/type_helpers.dart @@ -91,7 +91,8 @@ String enumMapName(InterfaceType type) => '_\$${type.element.name}EnumMap'; String _stateValueAccess(ParameterElement element, Set pathParameters) { if (element.isExtraField) { - return 'extra as ${element.type.getDisplayString()}'; + // ignore: avoid_redundant_argument_values + return 'extra as ${element.type.getDisplayString(withNullability: true)}'; } late String access;