From c8fc2858debae65ef147aedc64365af250a75325 Mon Sep 17 00:00:00 2001 From: fzyzcjy <5236035+fzyzcjy@users.noreply.github.com> Date: Mon, 31 Oct 2022 23:39:52 +0800 Subject: [PATCH] Fix incorrectly named "debug" prefix (#114117) --- packages/flutter/lib/src/rendering/object.dart | 10 +++++----- packages/flutter/lib/src/widgets/framework.dart | 14 +++++++------- .../flutter/lib/src/widgets/layout_builder.dart | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index 167e6b332a3..6ad6c45dffe 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -1549,7 +1549,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im /// * [DebugCreator], which the [widgets] library uses as values for this field. Object? debugCreator; - void _debugReportException(String method, Object exception, StackTrace stack) { + void _reportException(String method, Object exception, StackTrace stack) { FlutterError.reportError(FlutterErrorDetails( exception: exception, stack: stack, @@ -2007,7 +2007,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im performLayout(); markNeedsSemanticsUpdate(); } catch (e, stack) { - _debugReportException('performLayout', e, stack); + _reportException('performLayout', e, stack); } assert(() { _debugActiveLayout = debugPreviousActiveLayout; @@ -2151,7 +2151,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im return true; }()); } catch (e, stack) { - _debugReportException('performResize', e, stack); + _reportException('performResize', e, stack); } assert(() { _debugDoingThisResize = false; @@ -2173,7 +2173,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im return true; }()); } catch (e, stack) { - _debugReportException('performLayout', e, stack); + _reportException('performLayout', e, stack); } assert(() { _debugActiveLayout = debugPreviousActiveLayout; @@ -2831,7 +2831,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im assert(!_needsLayout); // check that the paint() method didn't mark us dirty again assert(!_needsPaint); // check that the paint() method didn't mark us dirty again } catch (e, stack) { - _debugReportException('paint', e, stack); + _reportException('paint', e, stack); } assert(() { debugPaint(context, offset); diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index 220f974c927..bbc6e1275d9 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -2733,7 +2733,7 @@ class BuildOwner { try { element.rebuild(); } catch (e, stack) { - _debugReportException( + _reportException( ErrorDescription('while rebuilding dirty elements'), e, stack, @@ -3101,7 +3101,7 @@ class BuildOwner { // Catching the exception directly to avoid activating the ErrorWidget. // Since the tree is in a broken state, adding the ErrorWidget would // cause more exceptions. - _debugReportException(ErrorSummary('while finalizing the widget tree'), e, stack); + _reportException(ErrorSummary('while finalizing the widget tree'), e, stack); } finally { if (!kReleaseMode) { Timeline.finishSync(); @@ -4965,7 +4965,7 @@ abstract class ComponentElement extends Element { } catch (e, stack) { _debugDoingBuild = false; built = ErrorWidget.builder( - _debugReportException( + _reportException( ErrorDescription('building $this'), e, stack, @@ -4985,7 +4985,7 @@ abstract class ComponentElement extends Element { assert(_child != null); } catch (e, stack) { built = ErrorWidget.builder( - _debugReportException( + _reportException( ErrorDescription('building $this'), e, stack, @@ -5790,7 +5790,7 @@ abstract class RenderObjectElement extends Element { ErrorDescription('The ownership chain for the RenderObject that received the parent data was:\n ${debugGetCreatorChain(10)}'), ]); } on FlutterError catch (e) { - _debugReportException(ErrorSummary('while looking for parent data.'), e, e.stackTrace); + _reportException(ErrorSummary('while looking for parent data.'), e, e.stackTrace); } } return true; @@ -6121,7 +6121,7 @@ abstract class RenderObjectElement extends Element { // while still allowing debuggers to break on exception. Since the tree // is in a broken state, adding the ErrorWidget would likely cause more // exceptions, which is not good for the debugging experience. - _debugReportException(ErrorSummary('while applying parent data.'), e, e.stackTrace); + _reportException(ErrorSummary('while applying parent data.'), e, e.stackTrace); } return true; }()); @@ -6545,7 +6545,7 @@ class DebugCreator { String toString() => element.debugGetCreatorChain(12); } -FlutterErrorDetails _debugReportException( +FlutterErrorDetails _reportException( DiagnosticsNode context, Object exception, StackTrace? stack, { diff --git a/packages/flutter/lib/src/widgets/layout_builder.dart b/packages/flutter/lib/src/widgets/layout_builder.dart index a0bc9bcd700..9fa03d39caa 100644 --- a/packages/flutter/lib/src/widgets/layout_builder.dart +++ b/packages/flutter/lib/src/widgets/layout_builder.dart @@ -120,7 +120,7 @@ class _LayoutBuilderElement extends RenderOb debugWidgetBuilderValue(widget, built); } catch (e, stack) { built = ErrorWidget.builder( - _debugReportException( + _reportException( ErrorDescription('building $widget'), e, stack, @@ -136,7 +136,7 @@ class _LayoutBuilderElement extends RenderOb assert(_child != null); } catch (e, stack) { built = ErrorWidget.builder( - _debugReportException( + _reportException( ErrorDescription('building $widget'), e, stack, @@ -358,7 +358,7 @@ class _RenderLayoutBuilder extends RenderBox with RenderObjectWithChildMixin