From 55d7341a66e7b88f8adac528ffb50d7d3e8f3c21 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Mon, 16 Dec 2024 11:50:40 -0800 Subject: [PATCH] Formatter pre-work: Fix syntax in test_fixes (#160371) * removes an extra `)` in `app_bar.dart` * Moves class definitions and getter definition out of the `main` method in `widget_state.dart` (defining classes/getters inside of methods is not allowed in Dart) The formatter was stumbling over these syntax errors. --- .../flutter/test_fixes/material/app_bar.dart | 2 +- .../test_fixes/material/app_bar.dart.expect | 2 +- .../test_fixes/material/widget_state.dart | 107 +++++++++--------- .../material/widget_state.dart.expect | 107 +++++++++--------- 4 files changed, 108 insertions(+), 110 deletions(-) diff --git a/packages/flutter/test_fixes/material/app_bar.dart b/packages/flutter/test_fixes/material/app_bar.dart index a92423d145..f1000d1e3a 100644 --- a/packages/flutter/test_fixes/material/app_bar.dart +++ b/packages/flutter/test_fixes/material/app_bar.dart @@ -19,6 +19,6 @@ void main() { AppBar appBar = AppBar(); appBar = AppBar(backwardsCompatibility: true); - appBar = AppBar(backwardsCompatibility: false)); + appBar = AppBar(backwardsCompatibility: false); appBar.backwardsCompatibility; // Removing field reference not supported. } diff --git a/packages/flutter/test_fixes/material/app_bar.dart.expect b/packages/flutter/test_fixes/material/app_bar.dart.expect index 8faa156577..2c0a99fe2e 100644 --- a/packages/flutter/test_fixes/material/app_bar.dart.expect +++ b/packages/flutter/test_fixes/material/app_bar.dart.expect @@ -20,6 +20,6 @@ void main() { AppBar appBar = AppBar(); appBar = AppBar(); - appBar = AppBar()); + appBar = AppBar(); appBar.backwardsCompatibility; // Removing field reference not supported. } diff --git a/packages/flutter/test_fixes/material/widget_state.dart b/packages/flutter/test_fixes/material/widget_state.dart index 81c51b3577..28a748c07c 100644 --- a/packages/flutter/test_fixes/material/widget_state.dart +++ b/packages/flutter/test_fixes/material/widget_state.dart @@ -32,42 +32,6 @@ void main() { final MaterialStateProperty backgroundColor = MaterialStateColor.resolveWith(getColor); - class _MouseCursor extends MaterialStateMouseCursor { - const _MouseCursor(this.resolveCallback); - - final MaterialPropertyResolver resolveCallback; - - @override - MouseCursor resolve(Set states) => resolveCallback(states) ?? MouseCursor.uncontrolled; - } - - MaterialStateBorderSide? get side { - return MaterialStateBorderSide.resolveWith((Set states) { - if (states.contains(MaterialState.disabled)) { - if (states.contains(MaterialState.selected)) { - return const BorderSide(width: 2.0); - } - return BorderSide(width: 1.0); - } - if (states.contains(MaterialState.selected)) { - return const BorderSide(width: 1.5); - } - return BorderSide(width: 0.5); - }); - } - - class SelectedBorder extends RoundedRectangleBorder implements MaterialStateOutlinedBorder { - const SelectedBorder(); - - @override - OutlinedBorder? resolve(Set states) { - if (states.contains(MaterialState.selected)) { - return const RoundedRectangleBorder(); - } - return null; - } - } - TextStyle floatingLabelStyle = MaterialStateTextStyle.resolveWith( (Set states) { final Color color = @@ -90,26 +54,61 @@ void main() { final MaterialStatesController statesController = MaterialStatesController({if (widget.selected) MaterialState.selected}); +} - class _MyWidget extends StatefulWidget { - const _MyWidget({ - required this.controller, - required this.evaluator, - required this.materialState, +class _MouseCursor extends MaterialStateMouseCursor { + const _MouseCursor(this.resolveCallback); + + final MaterialPropertyResolver resolveCallback; + + @override + MouseCursor resolve(Set states) => resolveCallback(states) ?? MouseCursor.uncontrolled; +} + +class SelectedBorder extends RoundedRectangleBorder implements MaterialStateOutlinedBorder { + const SelectedBorder(); + + @override + OutlinedBorder? resolve(Set states) { + if (states.contains(MaterialState.selected)) { + return const RoundedRectangleBorder(); + } + return null; + } +} + +class _MyWidget extends StatefulWidget { + const _MyWidget({ + required this.controller, + required this.evaluator, + required this.materialState, + }); + + final bool Function(_MyWidgetState state) evaluator; + + /// Stream passed down to the child [_InnerWidget] to begin the process. + /// This plays the role of an actual user interaction in the wild, but allows + /// us to engage the system without mocking pointers/hovers etc. + final StreamController controller; + + /// The value we're watching in the given test. + final MaterialState materialState; + + MaterialStateBorderSide? get side { + return MaterialStateBorderSide.resolveWith((Set states) { + if (states.contains(MaterialState.disabled)) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(width: 2.0); + } + return BorderSide(width: 1.0); + } + if (states.contains(MaterialState.selected)) { + return const BorderSide(width: 1.5); + } + return BorderSide(width: 0.5); }); - - final bool Function(_MyWidgetState state) evaluator; - - /// Stream passed down to the child [_InnerWidget] to begin the process. - /// This plays the role of an actual user interaction in the wild, but allows - /// us to engage the system without mocking pointers/hovers etc. - final StreamController controller; - - /// The value we're watching in the given test. - final MaterialState materialState; - - @override - State createState() => _MyWidgetState(); } + @override + State createState() => _MyWidgetState(); } diff --git a/packages/flutter/test_fixes/material/widget_state.dart.expect b/packages/flutter/test_fixes/material/widget_state.dart.expect index a45ef36463..71f0a21393 100644 --- a/packages/flutter/test_fixes/material/widget_state.dart.expect +++ b/packages/flutter/test_fixes/material/widget_state.dart.expect @@ -32,42 +32,6 @@ void main() { final WidgetStateProperty backgroundColor = WidgetStateColor.resolveWith(getColor); - class _MouseCursor extends WidgetStateMouseCursor { - const _MouseCursor(this.resolveCallback); - - final WidgetPropertyResolver resolveCallback; - - @override - MouseCursor resolve(Set states) => resolveCallback(states) ?? MouseCursor.uncontrolled; - } - - WidgetStateBorderSide? get side { - return WidgetStateBorderSide.resolveWith((Set states) { - if (states.contains(WidgetState.disabled)) { - if (states.contains(WidgetState.selected)) { - return const BorderSide(width: 2.0); - } - return BorderSide(width: 1.0); - } - if (states.contains(WidgetState.selected)) { - return const BorderSide(width: 1.5); - } - return BorderSide(width: 0.5); - }); - } - - class SelectedBorder extends RoundedRectangleBorder implements WidgetStateOutlinedBorder { - const SelectedBorder(); - - @override - OutlinedBorder? resolve(Set states) { - if (states.contains(WidgetState.selected)) { - return const RoundedRectangleBorder(); - } - return null; - } - } - TextStyle floatingLabelStyle = WidgetStateTextStyle.resolveWith( (Set states) { final Color color = @@ -90,26 +54,61 @@ void main() { final WidgetStatesController statesController = WidgetStatesController({if (widget.selected) WidgetState.selected}); +} - class _MyWidget extends StatefulWidget { - const _MyWidget({ - required this.controller, - required this.evaluator, - required this.materialState, +class _MouseCursor extends WidgetStateMouseCursor { + const _MouseCursor(this.resolveCallback); + + final WidgetPropertyResolver resolveCallback; + + @override + MouseCursor resolve(Set states) => resolveCallback(states) ?? MouseCursor.uncontrolled; +} + +class SelectedBorder extends RoundedRectangleBorder implements WidgetStateOutlinedBorder { + const SelectedBorder(); + + @override + OutlinedBorder? resolve(Set states) { + if (states.contains(WidgetState.selected)) { + return const RoundedRectangleBorder(); + } + return null; + } +} + +class _MyWidget extends StatefulWidget { + const _MyWidget({ + required this.controller, + required this.evaluator, + required this.materialState, + }); + + final bool Function(_MyWidgetState state) evaluator; + + /// Stream passed down to the child [_InnerWidget] to begin the process. + /// This plays the role of an actual user interaction in the wild, but allows + /// us to engage the system without mocking pointers/hovers etc. + final StreamController controller; + + /// The value we're watching in the given test. + final WidgetState materialState; + + WidgetStateBorderSide? get side { + return WidgetStateBorderSide.resolveWith((Set states) { + if (states.contains(WidgetState.disabled)) { + if (states.contains(WidgetState.selected)) { + return const BorderSide(width: 2.0); + } + return BorderSide(width: 1.0); + } + if (states.contains(WidgetState.selected)) { + return const BorderSide(width: 1.5); + } + return BorderSide(width: 0.5); }); - - final bool Function(_MyWidgetState state) evaluator; - - /// Stream passed down to the child [_InnerWidget] to begin the process. - /// This plays the role of an actual user interaction in the wild, but allows - /// us to engage the system without mocking pointers/hovers etc. - final StreamController controller; - - /// The value we're watching in the given test. - final WidgetState materialState; - - @override - State createState() => _MyWidgetState(); } + @override + State createState() => _MyWidgetState(); }