firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LayoutExplorer cycle (#115526)

Browse Source 
* Fix LayoutExplorer cycle

* fix tests

* Update widget_inspector.dart

* Update widget_inspector.dart

* review

* expandPropertyValues
This commit is contained in:
LongCatIsLooong 2022-11-28 14:25:07 -08:00 committed by GitHub
parent b22ab5117f
commit ccc277c38b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 114 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/flutter/lib/src/widgets/widget_inspector.dart
View File

@ -2038,18 +2038,20 @@ mixin WidgetInspectorService {
subtreeDepth: subtreeDepth, subtreeDepth: subtreeDepth,
service: this, service: this,
addAdditionalPropertiesCallback: (DiagnosticsNode node, InspectorSerializationDelegate delegate) { addAdditionalPropertiesCallback: (DiagnosticsNode node, InspectorSerializationDelegate delegate) {
final Map<String, Object> additionalJson = <String, Object>{};
final Object? value = node.value; final Object? value = node.value;
if (value is Element) { final RenderObject? renderObject = value is Element ? value.renderObject : null;
final RenderObject? renderObject = value.renderObject; if (renderObject == null) {
if (renderObject != null) { return const <String, Object>{};
additionalJson['renderObject'] = }
renderObject.toDiagnosticsNode().toJsonMap(
delegate.copyWith( final DiagnosticsSerializationDelegate renderObjectSerializationDelegate = delegate.copyWith(
subtreeDepth: 0, subtreeDepth: 0,
includeProperties: true, includeProperties: true,
), expandPropertyValues: false,
); );
final Map<String, Object> additionalJson = <String, Object>{
'renderObject': renderObject.toDiagnosticsNode().toJsonMap(renderObjectSerializationDelegate),
};
final AbstractNode? renderParent = renderObject.parent; final AbstractNode? renderParent = renderObject.parent;
if (renderParent is RenderObject && subtreeDepth > 0) { if (renderParent is RenderObject && subtreeDepth > 0) {
@ -2121,8 +2123,6 @@ mixin WidgetInspectorService {
} catch (e) { } catch (e) {
// Not laid out yet. // Not laid out yet.
} }
}
}
return additionalJson; return additionalJson;
}, },
), ),
@ -3633,12 +3633,12 @@ class InspectorSerializationDelegate implements DiagnosticsSerializationDelegate
} }
@override @override
DiagnosticsSerializationDelegate copyWith({int? subtreeDepth, bool? includeProperties}) { DiagnosticsSerializationDelegate copyWith({int? subtreeDepth, bool? includeProperties, bool? expandPropertyValues}) {
return InspectorSerializationDelegate( return InspectorSerializationDelegate(
groupName: groupName, groupName: groupName,
summaryTree: summaryTree, summaryTree: summaryTree,
maxDescendentsTruncatableNode: maxDescendentsTruncatableNode, maxDescendentsTruncatableNode: maxDescendentsTruncatableNode,
expandPropertyValues: expandPropertyValues, expandPropertyValues: expandPropertyValues ?? this.expandPropertyValues,
subtreeDepth: subtreeDepth ?? this.subtreeDepth, subtreeDepth: subtreeDepth ?? this.subtreeDepth,
includeProperties: includeProperties ?? this.includeProperties, includeProperties: includeProperties ?? this.includeProperties,
service: service, service: service,

39
packages/flutter/test/widgets/widget_inspector_test.dart
View File

@ -18,6 +18,7 @@ import 'dart:convert';
import 'dart:math'; import 'dart:math';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart' show DragStartBehavior; import 'package:flutter/gestures.dart' show DragStartBehavior;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -3549,7 +3550,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
_CreationLocation location = knownLocations[id]!; _CreationLocation location = knownLocations[id]!;
expect(location.file, equals(file)); expect(location.file, equals(file));
// ClockText widget. // ClockText widget.
expect(location.line, equals(59)); expect(location.line, equals(60));
expect(location.column, equals(9)); expect(location.column, equals(9));
expect(location.name, equals('ClockText')); expect(location.name, equals('ClockText'));
expect(count, equals(1)); expect(count, equals(1));
@ -3559,7 +3560,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
location = knownLocations[id]!; location = knownLocations[id]!;
expect(location.file, equals(file)); expect(location.file, equals(file));
// Text widget in _ClockTextState build method. // Text widget in _ClockTextState build method.
expect(location.line, equals(97)); expect(location.line, equals(98));
expect(location.column, equals(12)); expect(location.column, equals(12));
expect(location.name, equals('Text')); expect(location.name, equals('Text'));
expect(count, equals(1)); expect(count, equals(1));
@ -3586,7 +3587,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
location = knownLocations[id]!; location = knownLocations[id]!;
expect(location.file, equals(file)); expect(location.file, equals(file));
// ClockText widget. // ClockText widget.
expect(location.line, equals(59)); expect(location.line, equals(60));
expect(location.column, equals(9)); expect(location.column, equals(9));
expect(location.name, equals('ClockText')); expect(location.name, equals('ClockText'));
expect(count, equals(3)); // 3 clock widget instances rebuilt. expect(count, equals(3)); // 3 clock widget instances rebuilt.
@ -3596,7 +3597,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
location = knownLocations[id]!; location = knownLocations[id]!;
expect(location.file, equals(file)); expect(location.file, equals(file));
// Text widget in _ClockTextState build method. // Text widget in _ClockTextState build method.
expect(location.line, equals(97)); expect(location.line, equals(98));
expect(location.column, equals(12)); expect(location.column, equals(12));
expect(location.name, equals('Text')); expect(location.name, equals('Text'));
expect(count, equals(3)); // 3 clock widget instances rebuilt. expect(count, equals(3)); // 3 clock widget instances rebuilt.
@ -4437,6 +4438,36 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
expect(mainAxisAlignment, equals('center')); expect(mainAxisAlignment, equals('center'));
expect(crossAxisAlignment, equals('start')); expect(crossAxisAlignment, equals('start'));
}); });
testWidgets('ext.flutter.inspector.getLayoutExplorerNode does not throw StackOverflowError',(WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/115228
const Key leafKey = ValueKey<String>('ColoredBox');
await tester.pumpWidget(
CupertinoApp(
home: CupertinoPageScaffold(
child: Builder(
builder: (BuildContext context) => ColoredBox(key: leafKey, color: CupertinoTheme.of(context).primaryColor),
),
),
),
);
final Element leaf = tester.element(find.byKey(leafKey));
service.setSelection(leaf, group);
final DiagnosticsNode diagnostic = leaf.toDiagnosticsNode();
final String id = service.toId(diagnostic, group)!;
Object? error;
try {
await service.testExtension(
WidgetInspectorServiceExtensions.getLayoutExplorerNode.name,
<String, String>{'id': id, 'groupName': group, 'subtreeDepth': '1'},
);
} catch (e) {
error = e;
}
expect(error, isNull);
});
}); });
test('ext.flutter.inspector.structuredErrors', () async { test('ext.flutter.inspector.structuredErrors', () async {