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

Arrow syntax for getters (#156483)

Browse Source 
This egotistical PR aims to draw attention to a [style guideline](https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md#use--for-getters-and-callbacks-that-just-return-literals-or-switch-expressions) that I changed:

> #### Use `=>` for getters and callbacks that just return literals or switch expressions

<br>

There was an opportunity for valuable discussion in #154753 about how this structure affects readability, but I shut it down pretty quick since there was a lot of other stuff going on there.

Interested to hear thoughts from @Piinks and others.
This commit is contained in:
Nate Wilson 2024-10-17 13:25:14 -06:00 committed by GitHub
parent fdbd855fdc
commit 6b1bc456f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 239 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart
View File

@ -67,18 +67,16 @@ class ResampleFlagVariant extends TestVariant<TestScenario> {
final Set<TestScenario> values = Set<TestScenario>.from(TestScenario.values);
late TestScenario currentValue;
bool get resample {
return switch (currentValue) {
TestScenario.resampleOn90Hz || TestScenario.resampleOn59Hz => true,
TestScenario.resampleOff90Hz || TestScenario.resampleOff59Hz => false,
};
}
double get frequency {
return switch (currentValue) {
TestScenario.resampleOn90Hz || TestScenario.resampleOff90Hz => 90.0,
TestScenario.resampleOn59Hz || TestScenario.resampleOff59Hz => 59.0,
};
}
bool get resample => switch (currentValue) {
TestScenario.resampleOn90Hz || TestScenario.resampleOn59Hz => true,
TestScenario.resampleOff90Hz || TestScenario.resampleOff59Hz => false,
};
double get frequency => switch (currentValue) {
TestScenario.resampleOn90Hz || TestScenario.resampleOff90Hz => 90.0,
TestScenario.resampleOn59Hz || TestScenario.resampleOff59Hz => 59.0,
};
Map<String, dynamic>? result;

14
dev/benchmarks/macrobenchmarks/lib/src/filtered_child_animation.dart
View File

@ -59,14 +59,12 @@ class _FilteredChildAnimationPageState extends State<FilteredChildAnimationPage>
setState(() => _filterType = selected ? type : null);
}
String get _title {
return switch (_filterType) {
FilterType.opacity => 'Fading Child Animation',
FilterType.rotateTransform => 'Transformed Child Animation',
FilterType.rotateFilter => 'Matrix Filtered Child Animation',
null => 'Static Child',
};
}
String get _title => switch (_filterType) {
FilterType.opacity => 'Fading Child Animation',
FilterType.rotateTransform => 'Transformed Child Animation',
FilterType.rotateFilter => 'Matrix Filtered Child Animation',
null => 'Static Child',
};
static Widget _makeChild(int rows, int cols, double fontSize, bool complex) {
final BoxDecoration decoration = BoxDecoration(

10
dev/conductor/core/lib/src/repository.dart
View File

@ -32,12 +32,10 @@ class Remote {
final RemoteName _name;
/// The name of the remote.
String get name {
return switch (_name) {
RemoteName.upstream => 'upstream',
RemoteName.mirror => 'mirror',
};
}
String get name => switch (_name) {
RemoteName.upstream => 'upstream',
RemoteName.mirror => 'mirror',
};
/// The URL of the remote.
final String url;

10
dev/devicelab/lib/framework/ab.dart
View File

@ -207,12 +207,10 @@ class ABTest {
return buffer.toString();
}
Set<String> get _allScoreKeys {
return <String>{
..._aResults.keys,
..._bResults.keys,
};
}
Set<String> get _allScoreKeys => <String>{
..._aResults.keys,
..._bResults.keys,
};
/// Returns the summary as a tab-separated spreadsheet.
///

28
dev/tools/gen_defaults/lib/fab_template.dart
View File

@ -53,24 +53,20 @@ class _${blockName}DefaultsM3 extends FloatingActionButtonThemeData {
@override Color? get hoverColor => ${componentColor("md.comp.fab.primary.hover.state-layer")};
@override
ShapeBorder? get shape {
return switch (type) {
_FloatingActionButtonType.regular => ${shape("md.comp.fab.primary.container")},
_FloatingActionButtonType.small => ${shape("md.comp.fab.primary.small.container")},
_FloatingActionButtonType.large => ${shape("md.comp.fab.primary.large.container")},
_FloatingActionButtonType.extended => ${shape("md.comp.extended-fab.primary.container")},
};
}
ShapeBorder? get shape => switch (type) {
_FloatingActionButtonType.regular => ${shape("md.comp.fab.primary.container")},
_FloatingActionButtonType.small => ${shape("md.comp.fab.primary.small.container")},
_FloatingActionButtonType.large => ${shape("md.comp.fab.primary.large.container")},
_FloatingActionButtonType.extended => ${shape("md.comp.extended-fab.primary.container")},
};
@override
double? get iconSize {
return switch (type) {
_FloatingActionButtonType.regular => ${getToken("md.comp.fab.primary.icon.size")},
_FloatingActionButtonType.small => ${getToken("md.comp.fab.primary.small.icon.size")},
_FloatingActionButtonType.large => ${getToken("md.comp.fab.primary.large.icon.size")},
_FloatingActionButtonType.extended => ${getToken("md.comp.extended-fab.primary.icon.size")},
};
}
double? get iconSize => switch (type) {
_FloatingActionButtonType.regular => ${getToken("md.comp.fab.primary.icon.size")},
_FloatingActionButtonType.small => ${getToken("md.comp.fab.primary.small.icon.size")},
_FloatingActionButtonType.large => ${getToken("md.comp.fab.primary.large.icon.size")},
_FloatingActionButtonType.extended => ${getToken("md.comp.extended-fab.primary.icon.size")},
};
@override EdgeInsetsGeometry? get extendedPadding => EdgeInsetsDirectional.only(start: hasChild && _isExtended ? 16.0 : 20.0, end: 20.0);
@override TextStyle? get extendedTextStyle => ${textStyle("md.comp.extended-fab.primary.label-text")};

19
examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart
View File

@ -85,21 +85,10 @@ class _DraggableScrollableSheetExampleState extends State<DraggableScrollableShe
);
}
bool get _isOnDesktopAndWeb {
if (kIsWeb) {
return true;
}
switch (defaultTargetPlatform) {
case TargetPlatform.macOS:
case TargetPlatform.linux:
case TargetPlatform.windows:
return true;
case TargetPlatform.android:
case TargetPlatform.iOS:
case TargetPlatform.fuchsia:
return false;
}
}
bool get _isOnDesktopAndWeb => kIsWeb || switch (defaultTargetPlatform) {
TargetPlatform.macOS || TargetPlatform.linux || TargetPlatform.windows => true,
TargetPlatform.android || TargetPlatform.iOS || TargetPlatform.fuchsia => false,
};
}
/// A draggable widget that accepts vertical drag gestures

19
examples/api/lib/widgets/page_view/page_view.0.dart
View File

@ -102,21 +102,10 @@ class _PageViewExampleState extends State<PageViewExample> with TickerProviderSt
);
}
bool get _isOnDesktopAndWeb {
if (kIsWeb) {
return true;
}
switch (defaultTargetPlatform) {
case TargetPlatform.macOS:
case TargetPlatform.linux:
case TargetPlatform.windows:
return true;
case TargetPlatform.android:
case TargetPlatform.iOS:
case TargetPlatform.fuchsia:
return false;
}
}
bool get _isOnDesktopAndWeb => kIsWeb || switch (defaultTargetPlatform) {
TargetPlatform.macOS || TargetPlatform.linux || TargetPlatform.windows => true,
TargetPlatform.android || TargetPlatform.iOS || TargetPlatform.fuchsia => false,
};
}
/// Page indicator for desktop and web platforms.

10
examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart
View File

@ -97,12 +97,10 @@ class RenderDiagonal extends RenderBox
// Returns children in hit test order.
@override
Iterable<RenderBox> get children {
return <RenderBox>[
if (_topLeft != null) _topLeft!,
if (_bottomRight != null) _bottomRight!,
];
}
Iterable<RenderBox> get children => <RenderBox>[
if (_topLeft != null) _topLeft!,
if (_bottomRight != null) _bottomRight!,
];
// LAYOUT

18
examples/platform_view/lib/main.dart
View File

@ -47,16 +47,14 @@ class _MyHomePageState extends State<MyHomePage> {
});
}
static Widget get _buttonText {
return switch (defaultTargetPlatform) {
TargetPlatform.android => const Text('Continue in Android view'),
TargetPlatform.iOS => const Text('Continue in iOS view'),
TargetPlatform.windows => const Text('Continue in Windows view'),
TargetPlatform.macOS => const Text('Continue in macOS view'),
TargetPlatform.linux => const Text('Continue in Linux view'),
TargetPlatform.fuchsia => throw UnimplementedError('Platform not yet implemented'),
};
}
static Widget get _buttonText => switch (defaultTargetPlatform) {
TargetPlatform.android => const Text('Continue in Android view'),
TargetPlatform.iOS => const Text('Continue in iOS view'),
TargetPlatform.windows => const Text('Continue in Windows view'),
TargetPlatform.macOS => const Text('Continue in macOS view'),
TargetPlatform.linux => const Text('Continue in Linux view'),
TargetPlatform.fuchsia => throw UnimplementedError('Platform not yet implemented'),
};
Future<void> _launchPlatformCount() async {
final int? platformCounter =

11
packages/flutter/lib/src/cupertino/date_picker.dart
View File

@ -2076,12 +2076,11 @@ class CupertinoTimerPicker extends StatefulWidget {
class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
late TextDirection textDirection;
late CupertinoLocalizations localizations;
int get textDirectionFactor {
return switch (textDirection) {
TextDirection.ltr => 1,
TextDirection.rtl => -1,
};
}
int get textDirectionFactor => switch (textDirection) {
TextDirection.ltr => 1,
TextDirection.rtl => -1,
};
// The currently selected values of the picker.
int? selectedHour;

12
packages/flutter/lib/src/foundation/diagnostics.dart
View File

@ -2143,13 +2143,11 @@ class FlagProperty extends DiagnosticsProperty<bool> {
}
@override
DiagnosticLevel get level {
return switch (value) {
true when ifTrue == null => DiagnosticLevel.hidden,
false when ifFalse == null => DiagnosticLevel.hidden,
_ => super.level,
};
}
DiagnosticLevel get level => switch (value) {
true when ifTrue == null => DiagnosticLevel.hidden,
false when ifFalse == null => DiagnosticLevel.hidden,
_ => super.level,
};
}
/// Property with an `Iterable<T>` [value] that can be displayed with

10
packages/flutter/lib/src/material/bottom_navigation_bar.dart
View File

@ -864,12 +864,10 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
//
// Unselected labels are shown by default for [BottomNavigationBarType.fixed],
// and hidden by default for [BottomNavigationBarType.shifting].
bool get _defaultShowUnselected {
return switch (_effectiveType) {
BottomNavigationBarType.shifting => false,
BottomNavigationBarType.fixed => true,
};
}
bool get _defaultShowUnselected => switch (_effectiveType) {
BottomNavigationBarType.shifting => false,
BottomNavigationBarType.fixed => true,
};
@override
void initState() {

26
packages/flutter/lib/src/material/button_theme.dart
View File

@ -254,13 +254,11 @@ class ButtonThemeData with Diagnosticable {
///
/// * [getPadding], which is used to calculate padding for the button's
/// child (typically the button's label).
EdgeInsetsGeometry get padding {
return _padding ?? switch (textTheme) {
ButtonTextTheme.normal => const EdgeInsets.symmetric(horizontal: 16.0),
ButtonTextTheme.accent => const EdgeInsets.symmetric(horizontal: 16.0),
ButtonTextTheme.primary => const EdgeInsets.symmetric(horizontal: 24.0),
};
}
EdgeInsetsGeometry get padding => _padding ?? switch (textTheme) {
ButtonTextTheme.normal => const EdgeInsets.symmetric(horizontal: 16.0),
ButtonTextTheme.accent => const EdgeInsets.symmetric(horizontal: 16.0),
ButtonTextTheme.primary => const EdgeInsets.symmetric(horizontal: 24.0),
};
final EdgeInsetsGeometry? _padding;
/// The shape of a button's material.
@ -277,14 +275,12 @@ class ButtonThemeData with Diagnosticable {
///
/// * [getShape], which is used to calculate the shape of the button's
/// [Material].
ShapeBorder get shape {
return _shape ?? switch (textTheme) {
ButtonTextTheme.normal || ButtonTextTheme.accent =>
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(2.0))),
ButtonTextTheme.primary =>
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0))),
};
}
ShapeBorder get shape => _shape ?? switch (textTheme) {
ButtonTextTheme.normal || ButtonTextTheme.accent =>
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(2.0))),
ButtonTextTheme.primary =>
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0))),
};
final ShapeBorder? _shape;
/// If true, then a [DropdownButton] menu's width will match the button's

20
packages/flutter/lib/src/material/drawer.dart
View File

@ -638,19 +638,15 @@ class DrawerControllerState extends State<DrawerController> with SingleTickerPro
);
}
AlignmentDirectional get _drawerOuterAlignment {
return switch (widget.alignment) {
DrawerAlignment.start => AlignmentDirectional.centerStart,
DrawerAlignment.end => AlignmentDirectional.centerEnd,
};
}
AlignmentDirectional get _drawerOuterAlignment => switch (widget.alignment) {
DrawerAlignment.start => AlignmentDirectional.centerStart,
DrawerAlignment.end => AlignmentDirectional.centerEnd,
};
AlignmentDirectional get _drawerInnerAlignment {
return switch (widget.alignment) {
DrawerAlignment.start => AlignmentDirectional.centerEnd,
DrawerAlignment.end => AlignmentDirectional.centerStart,
};
}
AlignmentDirectional get _drawerInnerAlignment => switch (widget.alignment) {
DrawerAlignment.start => AlignmentDirectional.centerEnd,
DrawerAlignment.end => AlignmentDirectional.centerStart,
};
Widget _buildDrawer(BuildContext context) {
final bool isDesktop = switch (Theme.of(context).platform) {

28
packages/flutter/lib/src/material/floating_action_button.dart
View File

@ -822,24 +822,20 @@ class _FABDefaultsM3 extends FloatingActionButtonThemeData {
@override Color? get hoverColor => _colors.onPrimaryContainer.withOpacity(0.08);
@override
ShapeBorder? get shape {
return switch (type) {
_FloatingActionButtonType.regular => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16.0))),
_FloatingActionButtonType.small => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12.0))),
_FloatingActionButtonType.large => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(28.0))),
_FloatingActionButtonType.extended => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16.0))),
};
}
ShapeBorder? get shape => switch (type) {
_FloatingActionButtonType.regular => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16.0))),
_FloatingActionButtonType.small => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12.0))),
_FloatingActionButtonType.large => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(28.0))),
_FloatingActionButtonType.extended => const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16.0))),
};
@override
double? get iconSize {
return switch (type) {
_FloatingActionButtonType.regular => 24.0,
_FloatingActionButtonType.small => 24.0,
_FloatingActionButtonType.large => 36.0,
_FloatingActionButtonType.extended => 24.0,
};
}
double? get iconSize => switch (type) {
_FloatingActionButtonType.regular => 24.0,
_FloatingActionButtonType.small => 24.0,
_FloatingActionButtonType.large => 36.0,
_FloatingActionButtonType.extended => 24.0,
};
@override EdgeInsetsGeometry? get extendedPadding => EdgeInsetsDirectional.only(start: hasChild && _isExtended ? 16.0 : 20.0, end: 20.0);
@override TextStyle? get extendedTextStyle => _textTheme.labelLarge;

20
packages/flutter/lib/src/material/ink_well.dart
View File

@ -1092,12 +1092,10 @@ class _InkResponseState extends State<_InkResponseStateWidget>
});
}
bool get _shouldShowFocus {
return switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => enabled && _hasFocus,
NavigationMode.directional => _hasFocus,
};
}
bool get _shouldShowFocus => switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => enabled && _hasFocus,
NavigationMode.directional => _hasFocus,
};
void updateFocusHighlights() {
final bool showFocus = switch (FocusManager.instance.highlightMode) {
@ -1275,12 +1273,10 @@ class _InkResponseState extends State<_InkResponseStateWidget>
updateHighlight(_HighlightType.hover, value: _hovering);
}
bool get _canRequestFocus {
return switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => enabled && widget.canRequestFocus,
NavigationMode.directional => true,
};
}
bool get _canRequestFocus => switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => enabled && widget.canRequestFocus,
NavigationMode.directional => true,
};
@override
Widget build(BuildContext context) {

14
packages/flutter/lib/src/material/input_decorator.dart
View File

@ -2097,14 +2097,12 @@ class _InputDecoratorState extends State<InputDecorator> with TickerProviderStat
.merge(decoration.errorStyle);
}
Set<MaterialState> get materialState {
return <MaterialState>{
if (!decoration.enabled) MaterialState.disabled,
if (isFocused) MaterialState.focused,
if (isHovering) MaterialState.hovered,
if (_hasError) MaterialState.error,
};
}
Set<MaterialState> get materialState => <MaterialState>{
if (!decoration.enabled) MaterialState.disabled,
if (isFocused) MaterialState.focused,
if (isHovering) MaterialState.hovered,
if (_hasError) MaterialState.error,
};
InputBorder _getDefaultBorder(ThemeData themeData, InputDecorationTheme defaults) {

26
packages/flutter/lib/src/material/list_tile.dart
View File

@ -1546,12 +1546,10 @@ class _LisTileDefaultsM2 extends ListTileThemeData {
Color? get tileColor => Colors.transparent;
@override
TextStyle? get titleTextStyle {
return switch (style!) {
ListTileStyle.drawer => _textTheme.bodyLarge,
ListTileStyle.list => _textTheme.titleMedium,
};
}
TextStyle? get titleTextStyle => switch (style!) {
ListTileStyle.drawer => _textTheme.bodyLarge,
ListTileStyle.list => _textTheme.titleMedium,
};
@override
TextStyle? get subtitleTextStyle => _textTheme.bodyMedium!
@ -1564,15 +1562,13 @@ class _LisTileDefaultsM2 extends ListTileThemeData {
Color? get selectedColor => _theme.colorScheme.primary;
@override
Color? get iconColor {
return switch (_theme.brightness) {
// For the sake of backwards compatibility, the default for unselected
// tiles is Colors.black45 rather than colorScheme.onSurface.withAlpha(0x73).
Brightness.light => Colors.black45,
// null -> use current icon theme color
Brightness.dark => null,
};
}
Color? get iconColor => switch (_theme.brightness) {
// For the sake of backwards compatibility, the default for unselected
// tiles is Colors.black45 rather than colorScheme.onSurface.withAlpha(0x73).
Brightness.light => Colors.black45,
// null -> use current icon theme color
Brightness.dark => null,
};
}
// BEGIN GENERATED TOKEN PROPERTIES - LisTile

14
packages/flutter/lib/src/material/range_slider.dart
View File

@ -1106,14 +1106,12 @@ class _RenderRangeSlider extends RenderBox with RelayoutWhenSystemFontsChangeMix
}
}
bool get showValueIndicator {
return switch (_sliderTheme.showValueIndicator!) {
ShowValueIndicator.onlyForDiscrete => isDiscrete,
ShowValueIndicator.onlyForContinuous => !isDiscrete,
ShowValueIndicator.always => true,
ShowValueIndicator.never => false,
};
}
bool get showValueIndicator => switch (_sliderTheme.showValueIndicator!) {
ShowValueIndicator.onlyForDiscrete => isDiscrete,
ShowValueIndicator.onlyForContinuous => !isDiscrete,
ShowValueIndicator.always => true,
ShowValueIndicator.never => false,
};
Size get _thumbSize => _sliderTheme.rangeThumbShape!.getPreferredSize(isEnabled, isDiscrete);

14
packages/flutter/lib/src/material/slider.dart
View File

@ -1391,14 +1391,12 @@ class _RenderSlider extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
}
}
bool get showValueIndicator {
return switch (_sliderTheme.showValueIndicator!) {
ShowValueIndicator.onlyForDiscrete => isDiscrete,
ShowValueIndicator.onlyForContinuous => !isDiscrete,
ShowValueIndicator.always => true,
ShowValueIndicator.never => false,
};
}
bool get showValueIndicator => switch (_sliderTheme.showValueIndicator!) {
ShowValueIndicator.onlyForDiscrete => isDiscrete,
ShowValueIndicator.onlyForContinuous => !isDiscrete,
ShowValueIndicator.always => true,
ShowValueIndicator.never => false,
};
double get _adjustmentUnit {
switch (_platform) {

10
packages/flutter/lib/src/rendering/editable.dart
View File

@ -1670,12 +1670,10 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin,
Axis get _viewportAxis => _isMultiline ? Axis.vertical : Axis.horizontal;
Offset get _paintOffset {
return switch (_viewportAxis) {
Axis.horizontal => Offset(-offset.pixels, 0.0),
Axis.vertical => Offset(0.0, -offset.pixels),
};
}
Offset get _paintOffset => switch (_viewportAxis) {
Axis.horizontal => Offset(-offset.pixels, 0.0),
Axis.vertical => Offset(0.0, -offset.pixels),
};
double get _viewportExtent {
assert(hasSize);

14
packages/flutter/lib/src/rendering/shifted_box.dart
View File

@ -670,14 +670,12 @@ class RenderConstrainedOverflowBox extends RenderAligningShiftedBox {
}
@override
bool get sizedByParent {
return switch (fit) {
OverflowBoxFit.max => true,
// If deferToChild, the size will be as small as its child when non-overflowing,
// thus it cannot be sizedByParent.
OverflowBoxFit.deferToChild => false,
};
}
bool get sizedByParent => switch (fit) {
OverflowBoxFit.max => true,
// If deferToChild, the size will be as small as its child when non-overflowing,
// thus it cannot be sizedByParent.
OverflowBoxFit.deferToChild => false,
};
@override
@protected

10
packages/flutter/lib/src/widgets/actions.dart
View File

@ -1338,12 +1338,10 @@ class _FocusableActionDetectorState extends State<FocusableActionDetector> {
}
}
bool get _canRequestFocus {
return switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => widget.enabled,
NavigationMode.directional => true,
};
}
bool get _canRequestFocus => switch (MediaQuery.maybeNavigationModeOf(context)) {
NavigationMode.traditional || null => widget.enabled,
NavigationMode.directional => true,
};
// This global key is needed to keep only the necessary widgets in the tree
// while maintaining the subtree's state.

10
packages/flutter/lib/src/widgets/scroll_physics.dart
View File

@ -787,12 +787,10 @@ class BouncingScrollPhysics extends ScrollPhysics {
double get dragStartDistanceMotionThreshold => 3.5;
@override
double get maxFlingVelocity {
return switch (decelerationRate) {
ScrollDecelerationRate.fast => kMaxFlingVelocity * 8.0,
ScrollDecelerationRate.normal => super.maxFlingVelocity,
};
}
double get maxFlingVelocity => switch (decelerationRate) {
ScrollDecelerationRate.fast => kMaxFlingVelocity * 8.0,
ScrollDecelerationRate.normal => super.maxFlingVelocity,
};
@override
SpringDescription get spring {

14
packages/flutter/lib/src/widgets/scrollable.dart
View File

@ -570,14 +570,12 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
///
/// Used by [EdgeDraggingAutoScroller] to progress the position forward when a
/// drag gesture reaches the edge of the [Viewport].
Offset get deltaToScrollOrigin {
return switch (axisDirection) {
AxisDirection.up => Offset(0, -position.pixels),
AxisDirection.down => Offset(0, position.pixels),
AxisDirection.left => Offset(-position.pixels, 0),
AxisDirection.right => Offset(position.pixels, 0),
};
}
Offset get deltaToScrollOrigin => switch (axisDirection) {
AxisDirection.up => Offset(0, -position.pixels),
AxisDirection.down => Offset(0, position.pixels),
AxisDirection.left => Offset(-position.pixels, 0),
AxisDirection.right => Offset(position.pixels, 0),
};
ScrollController get _effectiveScrollController => widget.controller ?? _fallbackScrollController!;

11
packages/flutter/lib/src/widgets/scrollbar.dart
View File

@ -395,12 +395,11 @@ class ScrollbarPainter extends ChangeNotifier implements CustomPainter {
// Track Offsets
// The track is offset by only padding.
double get _totalTrackMainAxisOffsets => _isVertical ? padding.vertical : padding.horizontal;
double get _leadingTrackMainAxisOffset {
return switch (_resolvedOrientation) {
ScrollbarOrientation.left || ScrollbarOrientation.right => padding.top,
ScrollbarOrientation.top || ScrollbarOrientation.bottom => padding.left,
};
}
double get _leadingTrackMainAxisOffset => switch (_resolvedOrientation) {
ScrollbarOrientation.left || ScrollbarOrientation.right => padding.top,
ScrollbarOrientation.top || ScrollbarOrientation.bottom => padding.left,
};
Rect? _thumbRect;
// The current scroll position + _leadingThumbMainAxisOffset

4
packages/flutter/lib/src/widgets/shortcuts.dart
View File

@ -545,9 +545,7 @@ class SingleActivator with Diagnosticable, MenuSerializableShortcut implements S
final bool includeRepeats;
@override
Iterable<LogicalKeyboardKey> get triggers {
return <LogicalKeyboardKey>[trigger];
}
Iterable<LogicalKeyboardKey> get triggers => <LogicalKeyboardKey>[trigger];
bool _shouldAcceptModifiers(Set<LogicalKeyboardKey> pressed) {
return control == pressed.intersection(_controlSynonyms).isNotEmpty

12
packages/flutter/lib/src/widgets/sliver_resizing_header.dart
View File

@ -136,13 +136,11 @@ class _RenderSliverResizingHeader extends RenderSliver with SlottedContainerRend
RenderBox? get child => childForSlot(_Slot.child);
@override
Iterable<RenderBox> get children {
return <RenderBox>[
if (minExtentPrototype != null) minExtentPrototype!,
if (maxExtentPrototype != null) maxExtentPrototype!,
if (child != null) child!,
];
}
Iterable<RenderBox> get children => <RenderBox>[
if (minExtentPrototype != null) minExtentPrototype!,
if (maxExtentPrototype != null) maxExtentPrototype!,
if (child != null) child!,
];
double boxExtent(RenderBox box) {
assert(box.hasSize);

14
packages/flutter_tools/lib/src/android/java.dart
View File

@ -123,14 +123,12 @@ class Java {
///
/// This map should be used as the environment when invoking any Java-dependent
/// processes, such as Gradle or Android SDK tools (avdmanager, sdkmanager, etc.)
Map<String, String> get environment {
return <String, String>{
if (javaHome != null) javaHomeEnvironmentVariable: javaHome!,
'PATH': _fileSystem.path.dirname(binaryPath) +
_os.pathVarSeparator +
_platform.environment['PATH']!,
};
}
Map<String, String> get environment => <String, String>{
if (javaHome != null) javaHomeEnvironmentVariable: javaHome!,
'PATH': _fileSystem.path.dirname(binaryPath) +
_os.pathVarSeparator +
_platform.environment['PATH']!,
};
/// Returns the version of java in the format \d(.\d)+(.\d)+
/// Returns null if version could not be determined.

18
packages/flutter_tools/lib/src/base/os.dart
View File

@ -633,16 +633,14 @@ enum HostPlatform {
windows_x64,
windows_arm64;
String get platformName {
return switch (this) {
HostPlatform.darwin_x64 => 'x64',
HostPlatform.darwin_arm64 => 'arm64',
HostPlatform.linux_x64 => 'x64',
HostPlatform.linux_arm64 => 'arm64',
HostPlatform.windows_x64 => 'x64',
HostPlatform.windows_arm64 => 'arm64',
};
}
String get platformName => switch (this) {
HostPlatform.darwin_x64 => 'x64',
HostPlatform.darwin_arm64 => 'arm64',
HostPlatform.linux_x64 => 'x64',
HostPlatform.linux_arm64 => 'arm64',
HostPlatform.windows_x64 => 'x64',
HostPlatform.windows_arm64 => 'arm64',
};
}
String getNameForHostPlatform(HostPlatform platform) {

28
packages/flutter_tools/lib/src/build_info.dart
View File

@ -649,23 +649,19 @@ enum AndroidArch {
x86,
x86_64;
String get archName {
return switch (this) {
AndroidArch.armeabi_v7a => 'armeabi-v7a',
AndroidArch.arm64_v8a => 'arm64-v8a',
AndroidArch.x86_64 => 'x86_64',
AndroidArch.x86 => 'x86'
};
}
String get archName => switch (this) {
AndroidArch.armeabi_v7a => 'armeabi-v7a',
AndroidArch.arm64_v8a => 'arm64-v8a',
AndroidArch.x86_64 => 'x86_64',
AndroidArch.x86 => 'x86',
};
String get platformName {
return switch (this) {
AndroidArch.armeabi_v7a => 'android-arm',
AndroidArch.arm64_v8a => 'android-arm64',
AndroidArch.x86_64 => 'android-x64',
AndroidArch.x86 => 'android-x86'
};
}
String get platformName => switch (this) {
AndroidArch.armeabi_v7a => 'android-arm',
AndroidArch.arm64_v8a => 'android-arm64',
AndroidArch.x86_64 => 'android-x64',
AndroidArch.x86 => 'android-x86',
};
}
/// The default set of iOS device architectures to build for.

12
packages/flutter_tools/lib/src/dart/analysis.dart
View File

@ -240,13 +240,11 @@ class AnalysisError implements Comparable<AnalysisError> {
String get _separator => _platform.isWindows ? '-' : '•';
String get colorSeverity {
return switch (writtenError.severityLevel) {
AnalysisSeverity.error => _terminal.color(writtenError.severity, TerminalColor.red),
AnalysisSeverity.warning => _terminal.color(writtenError.severity, TerminalColor.yellow),
AnalysisSeverity.info || AnalysisSeverity.none => writtenError.severity,
};
}
String get colorSeverity => switch (writtenError.severityLevel) {
AnalysisSeverity.error => _terminal.color(writtenError.severity, TerminalColor.red),
AnalysisSeverity.warning => _terminal.color(writtenError.severity, TerminalColor.yellow),
AnalysisSeverity.info || AnalysisSeverity.none => writtenError.severity,
};
String get type => writtenError.type;
String get code => writtenError.code;

42
packages/flutter_tools/lib/src/doctor_validator.dart
View File

@ -161,14 +161,12 @@ class ValidationResult {
final String? statusInfo;
final List<ValidationMessage> messages;
String get leadingBox {
return switch (type) {
ValidationType.crash => '[☠]',
ValidationType.missing => '[✗]',
ValidationType.success => '[✓]',
ValidationType.notAvailable || ValidationType.partial => '[!]',
};
}
String get leadingBox => switch (type) {
ValidationType.crash => '[☠]',
ValidationType.missing => '[✗]',
ValidationType.success => '[✓]',
ValidationType.notAvailable || ValidationType.partial => '[!]',
};
String get coloredLeadingBox {
return globals.terminal.color(leadingBox, switch (type) {
@ -179,15 +177,13 @@ class ValidationResult {
}
/// The string representation of the type.
String get typeStr {
return switch (type) {
ValidationType.crash => 'crash',
ValidationType.missing => 'missing',
ValidationType.success => 'installed',
ValidationType.notAvailable => 'notAvailable',
ValidationType.partial => 'partial',
};
}
String get typeStr => switch (type) {
ValidationType.crash => 'crash',
ValidationType.missing => 'missing',
ValidationType.success => 'installed',
ValidationType.notAvailable => 'notAvailable',
ValidationType.partial => 'partial',
};
@override
String toString() {
@ -237,13 +233,11 @@ class ValidationMessage {
bool get isInformation => type == ValidationMessageType.information;
String get indicator {
return switch (type) {
ValidationMessageType.error => '✗',
ValidationMessageType.hint => '!',
ValidationMessageType.information => '•',
};
}
String get indicator => switch (type) {
ValidationMessageType.error => '✗',
ValidationMessageType.hint => '!',
ValidationMessageType.information => '•',
};
String get coloredIndicator {
return globals.terminal.color(indicator, switch (type) {

8
packages/flutter_tools/lib/src/flutter_cache.dart
View File

@ -801,11 +801,9 @@ class IosUsbArtifacts extends CachedArtifact {
};
@override
Map<String, String> get environment {
return <String, String>{
'DYLD_LIBRARY_PATH': cache.getArtifactDirectory(name).path,
};
}
Map<String, String> get environment => <String, String>{
'DYLD_LIBRARY_PATH': cache.getArtifactDirectory(name).path,
};
@override
bool isUpToDateInner(FileSystem fileSystem) {

20
packages/flutter_tools/lib/src/macos/swift_packages.dart
View File

@ -91,17 +91,15 @@ class SwiftPackage {
final TemplateRenderer _templateRenderer;
/// Context for the [_swiftPackageTemplate] template.
Map<String, Object> get _templateContext {
return <String, Object>{
'swiftToolsVersion': minimumSwiftToolchainVersion,
'packageName': _name,
// Supported platforms can't be empty, so only include if not null.
'platforms': _formatPlatforms() ?? false,
'products': _formatProducts(),
'dependencies': _formatDependencies(),
'targets': _formatTargets(),
};
}
Map<String, Object> get _templateContext => <String, Object>{
'swiftToolsVersion': minimumSwiftToolchainVersion,
'packageName': _name,
// Supported platforms can't be empty, so only include if not null.
'platforms': _formatPlatforms() ?? false,
'products': _formatProducts(),
'dependencies': _formatDependencies(),
'targets': _formatTargets(),
};
/// Create a Package.swift using settings from [_templateContext].
void createSwiftPackage() {

12
packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
View File

@ -1247,13 +1247,11 @@ class FakeAsyncCrashingDoctor extends Doctor {
/// overriding the doctor.
class FakeDoctorValidatorsProvider implements DoctorValidatorsProvider {
@override
List<DoctorValidator> get validators {
return <DoctorValidator>[
PassingValidator('Passing Validator'),
PassingValidator('Another Passing Validator'),
PassingValidator('Providing validators is fun'),
];
}
List<DoctorValidator> get validators => <DoctorValidator>[
PassingValidator('Passing Validator'),
PassingValidator('Another Passing Validator'),
PassingValidator('Providing validators is fun'),
];
@override
List<Workflow> get workflows => <Workflow>[];