Skip to content

Commit bca0718

Browse files
pqpq
authored
rename local functions with _s (#102615)
1 parent 082f138 commit bca0718

File tree

73 files changed

+802
-802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+802
-802
lines changed

‎packages/flutter/lib/src/foundation/_isolates_io.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Future<R> compute<Q, R>(isolates.ComputeCallback<Q, R> callback, Q message, { St
1919
final RawReceivePort port = RawReceivePort();
2020
Timeline.finishSync();
2121

22-
void _timeEndAndCleanup() {
22+
void timeEndAndCleanup() {
2323
Timeline.startSync('$debugLabel: end', flow: Flow.end(flow.id));
2424
port.close();
2525
Timeline.finishSync();
2626
}
2727

2828
final Completer<dynamic> completer = Completer<dynamic>();
2929
port.handler = (dynamic msg) {
30-
_timeEndAndCleanup();
30+
timeEndAndCleanup();
3131
completer.complete(msg);
3232
};
3333

@@ -47,7 +47,7 @@ Future<R> compute<Q, R>(isolates.ComputeCallback<Q, R> callback, Q message, { St
4747
debugName: debugLabel,
4848
);
4949
} on Object {
50-
_timeEndAndCleanup();
50+
timeEndAndCleanup();
5151
rethrow;
5252
}
5353

‎packages/flutter/lib/src/material/input_decorator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ class _InputDecoratorState extends State<InputDecorator> with TickerProviderStat
19551955
}
19561956

19571957
Color _getIconColor(ThemeData themeData) {
1958-
Color _resolveIconColor(Set<MaterialState> states) {
1958+
Color resolveIconColor(Set<MaterialState> states) {
19591959
if (states.contains(MaterialState.disabled) && !states.contains(MaterialState.focused))
19601960
return themeData.disabledColor;
19611961

@@ -1970,7 +1970,7 @@ class _InputDecoratorState extends State<InputDecorator> with TickerProviderStat
19701970
}
19711971
}
19721972
return MaterialStateProperty.resolveAs(themeData.inputDecorationTheme.iconColor, materialState)
1973-
?? MaterialStateProperty.resolveWith(_resolveIconColor).resolve(materialState);
1973+
?? MaterialStateProperty.resolveWith(resolveIconColor).resolve(materialState);
19741974
}
19751975

19761976
Color _getPrefixIconColor(ThemeData themeData) {

‎packages/flutter/lib/src/material/range_slider.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ class _RangeSliderState extends State<RangeSlider> with TickerProviderStateMixin
614614
// This size is used as the max bounds for the painting of the value
615615
// indicators. It must be kept in sync with the function with the same name
616616
// in slider.dart.
617-
Size _screenSize() => MediaQuery.of(context).size;
617+
Size screenSize() => MediaQuery.of(context).size;
618618

619619
return CompositedTransformTarget(
620620
link: _layerLink,
@@ -624,7 +624,7 @@ class _RangeSliderState extends State<RangeSlider> with TickerProviderStateMixin
624624
labels: widget.labels,
625625
sliderTheme: sliderTheme,
626626
textScaleFactor: MediaQuery.of(context).textScaleFactor,
627-
screenSize: _screenSize(),
627+
screenSize: screenSize(),
628628
onChanged: (widget.onChanged != null) && (widget.max > widget.min) ? _handleChanged : null,
629629
onChangeStart: widget.onChangeStart != null ? _handleDragStart : null,
630630
onChangeEnd: widget.onChangeEnd != null ? _handleDragEnd : null,

‎packages/flutter/lib/src/material/scaffold.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
20642064
// support drag or swipe to dismiss.
20652065
final AnimationController animationController = BottomSheet.createAnimationController(this)..value = 1.0;
20662066
LocalHistoryEntry? persistentSheetHistoryEntry;
2067-
bool _persistentBottomSheetExtentChanged(DraggableScrollableNotification notification) {
2067+
bool persistentBottomSheetExtentChanged(DraggableScrollableNotification notification) {
20682068
if (notification.extent > notification.initialExtent) {
20692069
if (persistentSheetHistoryEntry == null) {
20702070
persistentSheetHistoryEntry = LocalHistoryEntry(onRemove: () {
@@ -2086,7 +2086,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
20862086
_currentBottomSheet = _buildBottomSheet<void>(
20872087
(BuildContext context) {
20882088
return NotificationListener<DraggableScrollableNotification>(
2089-
onNotification: _persistentBottomSheetExtentChanged,
2089+
onNotification: persistentBottomSheetExtentChanged,
20902090
child: DraggableScrollableActuator(
20912091
child: StatefulBuilder(
20922092
key: _currentBottomSheetKey,
@@ -2166,7 +2166,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
21662166

21672167
bool removedEntry = false;
21682168
bool doingDispose = false;
2169-
void _removeCurrentBottomSheet() {
2169+
void removeCurrentBottomSheet() {
21702170
removedEntry = true;
21712171
if (_currentBottomSheet == null) {
21722172
return;
@@ -2190,11 +2190,11 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
21902190
? null
21912191
: LocalHistoryEntry(onRemove: () {
21922192
if (!removedEntry && _currentBottomSheet?._widget == bottomSheet && !doingDispose) {
2193-
_removeCurrentBottomSheet();
2193+
removeCurrentBottomSheet();
21942194
}
21952195
});
21962196

2197-
void _removeEntryIfNeeded() {
2197+
void removeEntryIfNeeded() {
21982198
if (!isPersistent && !removedEntry) {
21992199
assert(entry != null);
22002200
entry!.remove();
@@ -2211,7 +2211,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
22112211
return;
22122212
}
22132213
assert(_currentBottomSheet!._widget == bottomSheet);
2214-
_removeEntryIfNeeded();
2214+
removeEntryIfNeeded();
22152215
},
22162216
onDismissed: () {
22172217
if (_dismissedBottomSheets.contains(bottomSheet)) {
@@ -2222,7 +2222,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
22222222
},
22232223
onDispose: () {
22242224
doingDispose = true;
2225-
_removeEntryIfNeeded();
2225+
removeEntryIfNeeded();
22262226
if (shouldDisposeAnimationController) {
22272227
animationController.dispose();
22282228
}
@@ -2244,7 +2244,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
22442244
completer,
22452245
entry != null
22462246
? entry.remove
2247-
: _removeCurrentBottomSheet,
2247+
: removeCurrentBottomSheet,
22482248
(VoidCallback fn) { bottomSheetKey.currentState?.setState(fn); },
22492249
!isPersistent,
22502250
);

‎packages/flutter/lib/src/material/slider.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ class _SliderState extends State<Slider> with TickerProviderStateMixin {
715715
// This size is used as the max bounds for the painting of the value
716716
// indicators It must be kept in sync with the function with the same name
717717
// in range_slider.dart.
718-
Size _screenSize() => MediaQuery.of(context).size;
718+
Size screenSize() => MediaQuery.of(context).size;
719719

720720
VoidCallback? handleDidGainAccessibilityFocus;
721721
switch (theme.platform) {
@@ -757,7 +757,7 @@ class _SliderState extends State<Slider> with TickerProviderStateMixin {
757757
label: widget.label,
758758
sliderTheme: sliderTheme,
759759
textScaleFactor: MediaQuery.of(context).textScaleFactor,
760-
screenSize: _screenSize(),
760+
screenSize: screenSize(),
761761
onChanged: (widget.onChanged != null) && (widget.max > widget.min) ? _handleChanged : null,
762762
onChangeStart: _handleDragStart,
763763
onChangeEnd: _handleDragEnd,

‎packages/flutter/lib/src/material/time.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ class TimeOfDay {
124124

125125
@override
126126
String toString() {
127-
String _addLeadingZeroIfNeeded(int value) {
127+
String addLeadingZeroIfNeeded(int value) {
128128
if (value < 10)
129129
return '0$value';
130130
return value.toString();
131131
}
132132

133-
final String hourLabel = _addLeadingZeroIfNeeded(hour);
134-
final String minuteLabel = _addLeadingZeroIfNeeded(minute);
133+
final String hourLabel = addLeadingZeroIfNeeded(hour);
134+
final String minuteLabel = addLeadingZeroIfNeeded(minute);
135135

136136
return '$TimeOfDay($hourLabel:$minuteLabel)';
137137
}

‎packages/flutter/lib/src/services/raw_keyboard.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ abstract class RawKeyEvent with Diagnosticable {
288288
/// instead of using the message information.
289289
factory RawKeyEvent.fromMessage(Map<String, Object?> message) {
290290
String? character;
291-
RawKeyEventData _dataFromWeb() {
291+
RawKeyEventData dataFromWeb() {
292292
final String? key = message['key'] as String?;
293293
if (key != null && key.isNotEmpty && key.length == 1) {
294294
character = key;
@@ -304,7 +304,7 @@ abstract class RawKeyEvent with Diagnosticable {
304304

305305
final RawKeyEventData data;
306306
if (kIsWeb) {
307-
data = _dataFromWeb();
307+
data = dataFromWeb();
308308
} else {
309309
final String keymap = message['keymap']! as String;
310310
switch (keymap) {
@@ -382,7 +382,7 @@ abstract class RawKeyEvent with Diagnosticable {
382382
}
383383
break;
384384
case 'web':
385-
data = _dataFromWeb();
385+
data = dataFromWeb();
386386
break;
387387
default:
388388
/// This exception would only be hit on platforms that haven't yet

‎packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ class _DraggableScrollableSheetScrollPosition
896896
// See: [beginActivity].
897897
_ballisticCancelCallback = ballisticController.stop;
898898
double lastPosition = extent.currentPixels;
899-
void _tick() {
899+
void tick() {
900900
final double delta = ballisticController.value - lastPosition;
901901
lastPosition = ballisticController.value;
902902
extent.addPixelDelta(delta, context.notificationContext!);
@@ -913,7 +913,7 @@ class _DraggableScrollableSheetScrollPosition
913913
}
914914

915915
ballisticController
916-
..addListener(_tick)
916+
..addListener(tick)
917917
..animateWith(simulation).whenCompleteOrCancel(
918918
() {
919919
_ballisticCancelCallback = null;

‎packages/flutter/lib/src/widgets/editable_text.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4097,7 +4097,7 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent> exten
40974097

40984098
final bool collapseSelection = intent.collapseSelection || !state.widget.selectionEnabled;
40994099
// Collapse to the logical start/end.
4100-
TextSelection _collapse(TextSelection selection) {
4100+
TextSelection collapse(TextSelection selection) {
41014101
assert(selection.isValid);
41024102
assert(!selection.isCollapsed);
41034103
return selection.copyWith(
@@ -4109,7 +4109,7 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent> exten
41094109
if (!selection.isCollapsed && !ignoreNonCollapsedSelection && collapseSelection) {
41104110
return Actions.invoke(
41114111
context!,
4112-
UpdateSelectionIntent(state._value, _collapse(selection), SelectionChangedCause.keyboard),
4112+
UpdateSelectionIntent(state._value, collapse(selection), SelectionChangedCause.keyboard),
41134113
);
41144114
}
41154115

@@ -4121,7 +4121,7 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent> exten
41214121
if (!textBoundarySelection.isCollapsed && !ignoreNonCollapsedSelection && collapseSelection) {
41224122
return Actions.invoke(
41234123
context!,
4124-
UpdateSelectionIntent(state._value, _collapse(textBoundarySelection), SelectionChangedCause.keyboard),
4124+
UpdateSelectionIntent(state._value, collapse(textBoundarySelection), SelectionChangedCause.keyboard),
41254125
);
41264126
}
41274127

‎packages/flutter/lib/src/widgets/routes.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
316316
// finishes. We leave a listener remover for the next call to
317317
// properly clean up the existing train hopping.
318318
TrainHoppingAnimation? newAnimation;
319-
void _jumpOnAnimationEnd(AnimationStatus status) {
319+
void jumpOnAnimationEnd(AnimationStatus status) {
320320
switch (status) {
321321
case AnimationStatus.completed:
322322
case AnimationStatus.dismissed:
@@ -335,10 +335,10 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
335335
}
336336
}
337337
_trainHoppingListenerRemover = () {
338-
nextTrain.removeStatusListener(_jumpOnAnimationEnd);
338+
nextTrain.removeStatusListener(jumpOnAnimationEnd);
339339
newAnimation?.dispose();
340340
};
341-
nextTrain.addStatusListener(_jumpOnAnimationEnd);
341+
nextTrain.addStatusListener(jumpOnAnimationEnd);
342342
newAnimation = TrainHoppingAnimation(
343343
currentTrain,
344344
nextTrain,

‎packages/flutter/lib/src/widgets/scrollbar.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,8 @@ class ScrollbarPainter extends ChangeNotifier implements CustomPainter {
409409
_lastMetrics = metrics;
410410
_lastAxisDirection = axisDirection;
411411

412-
bool _needPaint(ScrollMetrics? metrics) => metrics != null && metrics.maxScrollExtent > metrics.minScrollExtent;
413-
if (!_needPaint(oldMetrics) && !_needPaint(metrics))
412+
bool needPaint(ScrollMetrics? metrics) => metrics != null && metrics.maxScrollExtent > metrics.minScrollExtent;
413+
if (!needPaint(oldMetrics) && !needPaint(metrics))
414414
return;
415415

416416
notifyListeners();

‎packages/flutter/lib/src/widgets/widget_inspector.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2328,11 +2328,11 @@ class _WidgetInspectorState extends State<WidgetInspector>
23282328

23292329
_hitTestHelper(regularHits, edgeHits, position, root, root.getTransformTo(null));
23302330
// Order matches by the size of the hit area.
2331-
double _area(RenderObject object) {
2331+
double area(RenderObject object) {
23322332
final Size size = object.semanticBounds.size;
23332333
return size.width * size.height;
23342334
}
2335-
regularHits.sort((RenderObject a, RenderObject b) => _area(a).compareTo(_area(b)));
2335+
regularHits.sort((RenderObject a, RenderObject b) => area(a).compareTo(area(b)));
23362336
final Set<RenderObject> hits = <RenderObject>{
23372337
...edgeHits,
23382338
...regularHits,

‎packages/flutter/test/cupertino/context_menu_action_test.dart

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void main() {
2323
const Color kDestructiveActionColor = CupertinoColors.destructiveRed;
2424
const FontWeight kDefaultActionWeight = FontWeight.w600;
2525

26-
Widget _getApp({
26+
Widget getApp({
2727
VoidCallback? onPressed,
2828
bool isDestructiveAction = false,
2929
bool isDefaultAction = false,
@@ -51,7 +51,7 @@ void main() {
5151
);
5252
}
5353

54-
TextStyle _getTextStyle(WidgetTester tester) {
54+
TextStyle getTextStyle(WidgetTester tester) {
5555
final Finder finder = find.descendant(
5656
of: find.byType(CupertinoContextMenuAction),
5757
matching: find.byType(DefaultTextStyle),
@@ -61,7 +61,7 @@ void main() {
6161
return defaultStyle.style;
6262
}
6363

64-
Icon _getIcon(WidgetTester tester) {
64+
Icon getIcon(WidgetTester tester) {
6565
final Finder finder = find.descendant(
6666
of: find.byType(CupertinoContextMenuAction),
6767
matching: find.byType(Icon),
@@ -73,7 +73,7 @@ void main() {
7373

7474
testWidgets('responds to taps', (WidgetTester tester) async {
7575
bool wasPressed = false;
76-
await tester.pumpWidget(_getApp(onPressed: () {
76+
await tester.pumpWidget(getApp(onPressed: () {
7777
wasPressed = true;
7878
}));
7979

@@ -83,7 +83,7 @@ void main() {
8383
});
8484

8585
testWidgets('turns grey when pressed and held', (WidgetTester tester) async {
86-
await tester.pumpWidget(_getApp());
86+
await tester.pumpWidget(getApp());
8787
expect(find.byType(CupertinoContextMenuAction), paints..rect(color: kBackgroundColor.color));
8888

8989
final Offset actionCenterLight = tester.getCenter(find.byType(CupertinoContextMenuAction));
@@ -95,7 +95,7 @@ void main() {
9595
await tester.pump();
9696
expect(find.byType(CupertinoContextMenuAction), paints..rect(color: kBackgroundColor.color));
9797

98-
await tester.pumpWidget(_getApp(brightness: Brightness.dark));
98+
await tester.pumpWidget(getApp(brightness: Brightness.dark));
9999
expect(find.byType(CupertinoContextMenuAction), paints..rect(color: kBackgroundColor.darkColor));
100100

101101
final Offset actionCenterDark = tester.getCenter(find.byType(CupertinoContextMenuAction));
@@ -109,35 +109,35 @@ void main() {
109109
});
110110

111111
testWidgets('icon and textStyle colors are correct out of the box', (WidgetTester tester) async {
112-
await tester.pumpWidget(_getApp());
113-
expect(_getTextStyle(tester).color, CupertinoColors.label);
114-
expect(_getIcon(tester).color, CupertinoColors.label);
112+
await tester.pumpWidget(getApp());
113+
expect(getTextStyle(tester).color, CupertinoColors.label);
114+
expect(getIcon(tester).color, CupertinoColors.label);
115115
});
116116

117117
testWidgets('icon and textStyle colors are correct for destructive actions', (WidgetTester tester) async {
118-
await tester.pumpWidget(_getApp(isDestructiveAction: true));
119-
expect(_getTextStyle(tester).color, kDestructiveActionColor);
120-
expect(_getIcon(tester).color, kDestructiveActionColor);
118+
await tester.pumpWidget(getApp(isDestructiveAction: true));
119+
expect(getTextStyle(tester).color, kDestructiveActionColor);
120+
expect(getIcon(tester).color, kDestructiveActionColor);
121121
});
122122

123123
testWidgets('textStyle is correct for defaultAction', (WidgetTester tester) async {
124-
await tester.pumpWidget(_getApp(isDefaultAction: true));
125-
expect(_getTextStyle(tester).fontWeight, kDefaultActionWeight);
124+
await tester.pumpWidget(getApp(isDefaultAction: true));
125+
expect(getTextStyle(tester).fontWeight, kDefaultActionWeight);
126126
});
127127

128128
testWidgets(
129129
'Hovering over Cupertino context menu action updates cursor to clickable on Web',
130130
(WidgetTester tester) async {
131131
/// Cupertino context menu action without "onPressed" callback.
132-
await tester.pumpWidget(_getApp());
132+
await tester.pumpWidget(getApp());
133133
final Offset contextMenuAction = tester.getCenter(find.text('I am a CupertinoContextMenuAction'));
134134
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
135135
await gesture.addPointer(location: contextMenuAction);
136136
await tester.pumpAndSettle();
137137
expect(RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1), SystemMouseCursors.basic);
138138

139139
// / Cupertino context menu action with "onPressed" callback.
140-
await tester.pumpWidget(_getApp(onPressed: (){}));
140+
await tester.pumpWidget(getApp(onPressed: (){}));
141141
await gesture.moveTo(const Offset(10, 10));
142142
await tester.pumpAndSettle();
143143
expect(RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1), SystemMouseCursors.basic);

0 commit comments

Comments
 (0)