Jun 12, 2024 · Jun 5, 2024 · Jun 7, 2024 · Jun 7, 2024 · Jun 8, 2024 · Jun 8, 2024
diff --git a/packages/flutter/lib/src/widgets/service_extensions.dart b/packages/flutter/lib/src/widgets/service_extensions.dart
  /// * [WidgetInspectorService.initServiceExtensions], where the service
  ///   extension is registered.
  ///
 /// !!IMPORTANT!! Please use [getRootWidgetTree] instead.
 @Deprecated('UsegetRootWidgetTree instead.')
  getRootWidgetSummaryTree,

  /// Name of service extension that, when called, will return the
  /// * [WidgetInspectorService.initServiceExtensions], where the service
  ///   extension is registered.
  ///
 /// !!IMPORTANT!! Please use [getRootWidgetTree] instead.
 @Deprecated('UsegetRootWidgetTree instead.')
  getRootWidgetSummaryTreeWithPreviews,

  /// Name of service extension that, when called, will return the details
diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart
  ) {
    final String groupName = parameters['groupName']!;
    final Map<String, Object?>? result = _getRootWidgetTreeImpl(
        groupName: groupName, isSummaryTree: true, withPreviews: true);
      groupName: groupName,
      isSummaryTree: true,
      withPreviews: true,
    );
    return Future<Map<String, dynamic>>.value(<String, dynamic>{
      'result': result,
    });
    // Combine the given addAdditionalPropertiesCallback with logic to add text
    // previews as well (if withPreviews is true):
    Map<String, Object>? combinedAddAdditionalPropertiesCallback(
        DiagnosticsNode node, InspectorSerializationDelegate delegate) {
      Map<String, Object> additionalPropertiesJson = <String, Object>{};
      if (addAdditionalPropertiesCallback != null) {
        final Map<String, Object>? json =
            addAdditionalPropertiesCallback(node, delegate);
        if (json != null) {
          additionalPropertiesJson = json;
        }
      }
      DiagnosticsNode node,
      InspectorSerializationDelegate delegate,
    ) {
      final Map<String, Object> additionalPropertiesJson =
          addAdditionalPropertiesCallback?.call(node, delegate) ??
              <String, Object>{};
      if (!withPreviews) {
        return additionalPropertiesJson;
      }
diff --git a/packages/flutter/test/widgets/widget_inspector_test.dart b/packages/flutter/test/widgets/widget_inspector_test.dart

          /// Returns whether the child was created by the local project.
          bool wasCreatedByLocalProject(Map<String, Object?> childJson) {
            return childJson['createdByLocalProject'] != null &&
                childJson['createdByLocalProject'] == true;
            return childJson['createdByLocalProject'] == true;
          }

          /// Returns whether the child has a description matching [description].
          bool hasDescription(Map<String, Object?> childJson, {required String description}) {
            return childJson['description'] != null &&
                childJson['description'] == description;
          bool hasDescription(
            Map<String, Object?> childJson, {
            required String description,
          }) {
            return childJson['description'] == description;
          }

          /// Returns whether the child has a text preview matching [preview].
          bool hasTextPreview(Map<String, Object?> childJson, {required String preview}) {
            return childJson['textPreview'] != null &&
                childJson['textPreview'] == preview;
          bool hasTextPreview(
            Map<String, Object?> childJson, {
            required String preview,
          }) {
            return childJson['textPreview'] == preview;
          }

          /// Verifies that the children from the JSON response are identical to
          }

          bool allChildrenSatisfyCondition(Map<String, Object?> treeRoot,
              {required bool Function(Map<String, Object?> child) condition}) {
              {
            required bool Function(Map<String, Object?> child) condition,
          }) {
            final List<Object?> children = childrenFromJsonResponse(treeRoot);
            if (children.isEmpty) {
              return true;
            }

            for (int childIdx = 0; childIdx < children.length; childIdx++) {
              final Map<String, Object?> child =
                  children[childIdx]! as Map<String, Object?>;
          }

          bool oneChildSatisfiesCondition(Map<String, Object?> treeRoot,
              {required bool Function(Map<String, Object?> child) condition}) {
              {
            required bool Function(Map<String, Object?> child) condition,
          }) {
            final List<Object?> children = childrenFromJsonResponse(treeRoot);
            if (children.isEmpty) {
              return false;
            }

            for (int childIdx = 0; childIdx < children.length; childIdx++) {
              final Map<String, Object?> child =
                  children[childIdx]! as Map<String, Object?>;

              expect(
                  allChildrenSatisfyCondition(rootJson,
                      condition: wasCreatedByLocalProject),
                  isTrue);
                  condition: wasCreatedByLocalProject,
                ),
                isTrue,
              );
              await verifyChildrenMatchOtherApi(rootJson, group: group);
            });


              expect(
                  allChildrenSatisfyCondition(rootJson,
                      condition: wasCreatedByLocalProject),
                  isTrue);
                  condition: wasCreatedByLocalProject,
                ),
                isTrue,
              );
              await verifyChildrenMatchOtherApi(
                rootJson,
                group: group,
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    !hasTextPreview(child, preview: 'a');
              }),
                },
              ),
              isTrue,
            );
            expect(
              oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    !hasTextPreview(child, preview: 'b');
              }),
                },
              ),
              isTrue,
            );
            expect(
              oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    !hasTextPreview(child, preview: 'c');
              }),
                },
              ),
              isTrue,
            );
          });

            expect(
              allChildrenSatisfyCondition(rootJson,
                  condition: wasCreatedByLocalProject),
                condition: wasCreatedByLocalProject,
              ),
              isFalse,
            );
            expect(
              oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    hasTextPreview(child, preview: 'a');
              }),
                },
              ),
              isTrue,
            );
            expect(
              oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    hasTextPreview(child, preview: 'b');
              }),
                },
              ),
              isTrue,
            );
            expect(
              oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
                return hasDescription(child, description: 'Text') &&
                    wasCreatedByLocalProject(child) &&
                    hasTextPreview(child, preview: 'c');
              }),
                },
              ),
              isTrue,
            );
          });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -393,7 +393,7 @@ enum WidgetInspectorServiceExtensions {
		/// * [WidgetInspectorService.initServiceExtensions], where the service
		/// extension is registered.
		///
		/// !!IMPORTANT!! Please use [getRootWidgetTree] instead.
		@Deprecated('UsegetRootWidgetTree instead.')
		getRootWidgetSummaryTree,

		/// Name of service extension that, when called, will return the
Expand All		@@ -409,7 +409,7 @@ enum WidgetInspectorServiceExtensions {
		/// * [WidgetInspectorService.initServiceExtensions], where the service
		/// extension is registered.
		///
		/// !!IMPORTANT!! Please use [getRootWidgetTree] instead.
		@Deprecated('UsegetRootWidgetTree instead.')
		getRootWidgetSummaryTreeWithPreviews,

		/// Name of service extension that, when called, will return the details
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1969,7 +1969,10 @@ mixin WidgetInspectorService {
		) {
		final String groupName = parameters['groupName']!;
		final Map<String, Object?>? result = _getRootWidgetTreeImpl(
		groupName: groupName, isSummaryTree: true, withPreviews: true);
		groupName: groupName,
		isSummaryTree: true,
		withPreviews: true,
		);
		return Future<Map<String, dynamic>>.value(<String, dynamic>{
		'result': result,
		});
Expand DownExpand Up		@@ -2007,15 +2010,12 @@ mixin WidgetInspectorService {
		// Combine the given addAdditionalPropertiesCallback with logic to add text
		// previews as well (if withPreviews is true):
		Map<String, Object>? combinedAddAdditionalPropertiesCallback(
		DiagnosticsNode node, InspectorSerializationDelegate delegate) {
		Map<String, Object> additionalPropertiesJson = <String, Object>{};
		if (addAdditionalPropertiesCallback != null) {
		final Map<String, Object>? json =
		addAdditionalPropertiesCallback(node, delegate);
		if (json != null) {
		additionalPropertiesJson = json;
		}
		}
		DiagnosticsNode node,
		InspectorSerializationDelegate delegate,
		) {
		final Map<String, Object> additionalPropertiesJson =
		addAdditionalPropertiesCallback?.call(node, delegate) ??
		<String, Object>{};
		if (!withPreviews) {
		return additionalPropertiesJson;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1979,20 +1979,23 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {

		/// Returns whether the child was created by the local project.
		bool wasCreatedByLocalProject(Map<String, Object?> childJson) {
		return childJson['createdByLocalProject'] != null &&
		childJson['createdByLocalProject'] == true;
		return childJson['createdByLocalProject'] == true;
		}

		/// Returns whether the child has a description matching [description].
		bool hasDescription(Map<String, Object?> childJson, {required String description}) {
		return childJson['description'] != null &&
		childJson['description'] == description;
		bool hasDescription(
		Map<String, Object?> childJson, {
		required String description,
		}) {
		return childJson['description'] == description;
		}

		/// Returns whether the child has a text preview matching [preview].
		bool hasTextPreview(Map<String, Object?> childJson, {required String preview}) {
		return childJson['textPreview'] != null &&
		childJson['textPreview'] == preview;
		bool hasTextPreview(
		Map<String, Object?> childJson, {
		required String preview,
		}) {
		return childJson['textPreview'] == preview;
		}

		/// Verifies that the children from the JSON response are identical to
Expand DownExpand Up		@@ -2076,12 +2079,10 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
		}

		bool allChildrenSatisfyCondition(Map<String, Object?> treeRoot,
		{required bool Function(Map<String, Object?> child) condition}) {
		{
		required bool Function(Map<String, Object?> child) condition,
		}) {
		final List<Object?> children = childrenFromJsonResponse(treeRoot);
		if (children.isEmpty) {
		return true;
		}

		for (int childIdx = 0; childIdx < children.length; childIdx++) {
		final Map<String, Object?> child =
		children[childIdx]! as Map<String, Object?>;
Expand All		@@ -2097,12 +2098,10 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
		}

		bool oneChildSatisfiesCondition(Map<String, Object?> treeRoot,
		{required bool Function(Map<String, Object?> child) condition}) {
		{
		required bool Function(Map<String, Object?> child) condition,
		}) {
		final List<Object?> children = childrenFromJsonResponse(treeRoot);
		if (children.isEmpty) {
		return false;
		}

		for (int childIdx = 0; childIdx < children.length; childIdx++) {
		final Map<String, Object?> child =
		children[childIdx]! as Map<String, Object?>;
Expand DownExpand Up		@@ -2209,8 +2208,10 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {

		expect(
		allChildrenSatisfyCondition(rootJson,
		condition: wasCreatedByLocalProject),
		isTrue);
		condition: wasCreatedByLocalProject,
		),
		isTrue,
		);
		await verifyChildrenMatchOtherApi(rootJson, group: group);
		});

Expand DownExpand Up		@@ -2241,8 +2242,10 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {

		expect(
		allChildrenSatisfyCondition(rootJson,
		condition: wasCreatedByLocalProject),
		isTrue);
		condition: wasCreatedByLocalProject,
		),
		isTrue,
		);
		await verifyChildrenMatchOtherApi(
		rootJson,
		group: group,
Expand DownExpand Up		@@ -2285,23 +2288,26 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		!hasTextPreview(child, preview: 'a');
		}),
		},
		),
		isTrue,
		);
		expect(
		oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		!hasTextPreview(child, preview: 'b');
		}),
		},
		),
		isTrue,
		);
		expect(
		oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		!hasTextPreview(child, preview: 'c');
		}),
		},
		),
		isTrue,
		);
		});
Expand DownExpand Up		@@ -2332,31 +2338,35 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {

		expect(
		allChildrenSatisfyCondition(rootJson,
		condition: wasCreatedByLocalProject),
		condition: wasCreatedByLocalProject,
		),
		isFalse,
		);
		expect(
		oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		hasTextPreview(child, preview: 'a');
		}),
		},
		),
		isTrue,
		);
		expect(
		oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		hasTextPreview(child, preview: 'b');
		}),
		},
		),
		isTrue,
		);
		expect(
		oneChildSatisfiesCondition(rootJson, condition: (Map<String, Object?> child) {
		return hasDescription(child, description: 'Text') &&
		wasCreatedByLocalProject(child) &&
		hasTextPreview(child, preview: 'c');
		}),
		},
		),
		isTrue,
		);
		});
Expand Down