Some additional cleanup

packages/go_router/lib/src/builder.dart

@@ -60,6 +60,8 @@ class RouteBuilder {
   /// changes.
   final List<NavigatorObserver> observers;
 
+  final GoRouterStateRegistry _registry = GoRouterStateRegistry();
+
   /// A callback called when a `route` produced by `match` is about to be popped
   /// with the `result`.
   ///
@@ -68,8 +70,6 @@ class RouteBuilder {
   /// If this method returns false, this builder aborts the pop.
   final PopPageWithRouteMatchCallback onPopPageWithRouteMatch;
 
-  final GoRouterStateRegistry _registry = GoRouterStateRegistry();
-
   /// Caches a HeroController for the nested Navigator, which solves cases where the
   /// Hero Widget animation stops working when navigating.
   // TODO(chunhtai): Remove _goHeroCache once below issue is fixed:

packages/go_router/lib/src/route.dart

@@ -619,7 +619,7 @@ class ShellRoute extends ShellRouteBase {
 /// when switching active branch.
 ///
 /// For a default implementation of [navigatorContainerBuilder], consider using
-/// [StackedShellRoute].
+/// [StatefulShellRoute].
 ///
 /// Below is a simple example of how a router configuration with
 /// StatefulShellRoute could be achieved. In this example, a
@@ -692,7 +692,7 @@ class ShellRoute extends ShellRouteBase {
 /// ```
 ///
 /// See [Stateful Nested Navigation](https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/stacked_shell_route.dart)
-/// for a complete runnable example using StatefulShellRoute and StackedShellRoute.
+/// for a complete runnable example using StatefulShellRoute and StatefulShellRoute.
 class StatefulShellRoute extends ShellRouteBase {
   /// Constructs a [StatefulShellRoute] from a list of [StatefulShellBranch]es,
   /// each representing a separate nested navigation tree (branch).

packages/go_router/test/configuration_test.dart

@@ -83,7 +83,7 @@ void main() {
     });
 
     test(
-        'throws when StackedShellRoute sub-route uses incorrect parentNavigatorKey',
+        'throws when StatefulShellRoute sub-route uses incorrect parentNavigatorKey',
         () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -125,7 +125,7 @@ void main() {
     });
 
     test(
-        'does not throw when StackedShellRoute sub-route uses correct parentNavigatorKeys',
+        'does not throw when StatefulShellRoute sub-route uses correct parentNavigatorKeys',
         () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -160,7 +160,7 @@ void main() {
     });
 
     test(
-        'throws when a sub-route of StackedShellRoute has a parentNavigatorKey',
+        'throws when a sub-route of StatefulShellRoute has a parentNavigatorKey',
         () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -205,7 +205,7 @@ void main() {
       );
     });
 
-    test('throws when StackedShellRoute has duplicate navigator keys', () {
+    test('throws when StatefulShellRoute has duplicate navigator keys', () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
       final GlobalKey<NavigatorState> keyA =
@@ -236,7 +236,7 @@ void main() {
     });
 
     test(
-        'throws when a child of StackedShellRoute has an incorrect '
+        'throws when a child of StatefulShellRoute has an incorrect '
         'parentNavigatorKey', () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -277,7 +277,7 @@ void main() {
     });
 
     test(
-        'throws when a branch of a StackedShellRoute has an incorrect '
+        'throws when a branch of a StatefulShellRoute has an incorrect '
         'initialLocation', () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -323,7 +323,7 @@ void main() {
     });
 
     test(
-        'throws when a branch of a StackedShellRoute has a initialLocation '
+        'throws when a branch of a StatefulShellRoute has a initialLocation '
         'that is not a descendant of the same branch', () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');
@@ -378,7 +378,7 @@ void main() {
     });
 
     test(
-        'does not throw when a branch of a StackedShellRoute has correctly '
+        'does not throw when a branch of a StatefulShellRoute has correctly '
         'configured initialLocations', () {
       final GlobalKey<NavigatorState> root =
           GlobalKey<NavigatorState>(debugLabel: 'root');

packages/go_router/test/go_router_test.dart

@@ -2504,7 +2504,7 @@ void main() {
       expect(imperativeRouteMatch.matches.pathParameters['pid'], pid);
     });
 
-    testWidgets('StackedShellRoute supports nested routes with params',
+    testWidgets('StatefulShellRoute supports nested routes with params',
         (WidgetTester tester) async {
       StatefulNavigationShell? routeState;
       final List<RouteBase> routes = <RouteBase>[
@@ -3075,7 +3075,7 @@ void main() {
       expect(find.text('Screen C'), findsNothing);
     });
 
-    testWidgets('Builds StackedShellRoute', (WidgetTester tester) async {
+    testWidgets('Builds StatefulShellRoute', (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
 
@@ -3114,7 +3114,7 @@ void main() {
       expect(find.text('Screen B'), findsOneWidget);
     });
 
-    testWidgets('Builds StackedShellRoute as a sub-route',
+    testWidgets('Builds StatefulShellRoute as a sub-route',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3162,7 +3162,7 @@ void main() {
     });
 
     testWidgets(
-        'Navigation with goBranch is correctly handled in StackedShellRoute',
+        'Navigation with goBranch is correctly handled in StatefulShellRoute',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3254,7 +3254,7 @@ void main() {
     });
 
     testWidgets(
-        'Navigates to correct nested navigation tree in StackedShellRoute '
+        'Navigates to correct nested navigation tree in StatefulShellRoute '
         'and maintains state', (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3324,7 +3324,7 @@ void main() {
       expect(statefulWidgetKey.currentState?.counter, equals(0));
     });
 
-    testWidgets('Maintains state for nested StackedShellRoute',
+    testWidgets('Maintains state for nested StatefulShellRoute',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3421,7 +3421,7 @@ void main() {
     });
 
     testWidgets(
-        'Pops from the correct Navigator in a StackedShellRoute when the '
+        'Pops from the correct Navigator in a StatefulShellRoute when the '
         'Android back button is pressed', (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3511,7 +3511,7 @@ void main() {
 
     testWidgets(
         'Maintains extra navigation information when navigating '
-        'between branches in StackedShellRoute', (WidgetTester tester) async {
+        'between branches in StatefulShellRoute', (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
       StatefulNavigationShell? routeState;
@@ -3564,7 +3564,7 @@ void main() {
 
     testWidgets(
         'Pushed non-descendant routes are correctly restored when '
-        'navigating between branches in StackedShellRoute',
+        'navigating between branches in StatefulShellRoute',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3629,7 +3629,7 @@ void main() {
 
     testWidgets(
         'Redirects are correctly handled when switching branch in a '
-        'StackedShellRoute', (WidgetTester tester) async {
+        'StatefulShellRoute', (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
       StatefulNavigationShell? routeState;
@@ -3724,7 +3724,7 @@ void main() {
     });
 
     testWidgets(
-        'Pushed top-level route is correctly handled by StackedShellRoute',
+        'Pushed top-level route is correctly handled by StatefulShellRoute',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -3954,7 +3954,7 @@ void main() {
       );
 
       testWidgets(
-        'It checks if StackedShellRoute navigators can pop',
+        'It checks if StatefulShellRoute navigators can pop',
         (WidgetTester tester) async {
           final GlobalKey<NavigatorState> rootNavigatorKey =
               GlobalKey<NavigatorState>();
@@ -4015,7 +4015,7 @@ void main() {
           expect(find.text('Screen B detail', skipOffstage: false),
               findsOneWidget);
           expect(router.canPop(), true);
-          // Verify that it is actually the StackedShellRoute that reports
+          // Verify that it is actually the StatefulShellRoute that reports
           // canPop = true
           expect(rootNavigatorKey.currentState?.canPop(), false);
         },
@@ -4370,7 +4370,7 @@ void main() {
       expect(statefulWidgetKeyA.currentState?.counter, equals(1));
     });
 
-    testWidgets('Restores state of branches in StackedShellRoute correctly',
+    testWidgets('Restores state of branches in StatefulShellRoute correctly',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();
@@ -4503,7 +4503,7 @@ void main() {
     });
 
     testWidgets(
-        'Restores state of imperative routes in StackedShellRoute correctly',
+        'Restores state of imperative routes in StatefulShellRoute correctly',
         (WidgetTester tester) async {
       final GlobalKey<NavigatorState> rootNavigatorKey =
           GlobalKey<NavigatorState>();