Unverified Commit ac88d4ba authored by Konstantin Scheglov's avatar Konstantin Scheglov Committed by GitHub

Fix avoid_renaming_method_parameters for pending analyzer change. (#85482)

parent a44f3732
...@@ -347,8 +347,8 @@ abstract class WidgetRecorder extends Recorder implements FrameRecorder { ...@@ -347,8 +347,8 @@ abstract class WidgetRecorder extends Recorder implements FrameRecorder {
final List<VoidCallback> _didStopCallbacks = <VoidCallback>[]; final List<VoidCallback> _didStopCallbacks = <VoidCallback>[];
@override @override
void registerDidStop(VoidCallback fn) { void registerDidStop(VoidCallback cb) {
_didStopCallbacks.add(fn); _didStopCallbacks.add(cb);
} }
@override @override
...@@ -443,8 +443,8 @@ abstract class WidgetBuildRecorder extends Recorder implements FrameRecorder { ...@@ -443,8 +443,8 @@ abstract class WidgetBuildRecorder extends Recorder implements FrameRecorder {
final List<VoidCallback> _didStopCallbacks = <VoidCallback>[]; final List<VoidCallback> _didStopCallbacks = <VoidCallback>[];
@override @override
void registerDidStop(VoidCallback fn) { void registerDidStop(VoidCallback cb) {
_didStopCallbacks.add(fn); _didStopCallbacks.add(cb);
} }
@override @override
......
...@@ -762,10 +762,10 @@ class DefaultMaterialLocalizations implements MaterialLocalizations { ...@@ -762,10 +762,10 @@ class DefaultMaterialLocalizations implements MaterialLocalizations {
String get dateRangeEndLabel => 'End Date'; String get dateRangeEndLabel => 'End Date';
@override @override
String dateRangeStartDateSemanticLabel(String fullDate) => 'Start date $fullDate'; String dateRangeStartDateSemanticLabel(String formattedDate) => 'Start date $formattedDate';
@override @override
String dateRangeEndDateSemanticLabel(String fullDate) => 'End date $fullDate'; String dateRangeEndDateSemanticLabel(String formattedDate) => 'End date $formattedDate';
@override @override
String get invalidDateFormatLabel => 'Invalid format.'; String get invalidDateFormatLabel => 'Invalid format.';
......
...@@ -123,10 +123,10 @@ class JSONMethodCodec implements MethodCodec { ...@@ -123,10 +123,10 @@ class JSONMethodCodec implements MethodCodec {
const JSONMethodCodec(); const JSONMethodCodec();
@override @override
ByteData encodeMethodCall(MethodCall call) { ByteData encodeMethodCall(MethodCall methodCall) {
return const JSONMessageCodec().encodeMessage(<String, Object?>{ return const JSONMessageCodec().encodeMessage(<String, Object?>{
'method': call.method, 'method': methodCall.method,
'args': call.arguments, 'args': methodCall.arguments,
})!; })!;
} }
...@@ -555,10 +555,10 @@ class StandardMethodCodec implements MethodCodec { ...@@ -555,10 +555,10 @@ class StandardMethodCodec implements MethodCodec {
final StandardMessageCodec messageCodec; final StandardMessageCodec messageCodec;
@override @override
ByteData encodeMethodCall(MethodCall call) { ByteData encodeMethodCall(MethodCall methodCall) {
final WriteBuffer buffer = WriteBuffer(); final WriteBuffer buffer = WriteBuffer();
messageCodec.writeValue(buffer, call.method); messageCodec.writeValue(buffer, methodCall.method);
messageCodec.writeValue(buffer, call.arguments); messageCodec.writeValue(buffer, methodCall.arguments);
return buffer.done(); return buffer.done();
} }
......
...@@ -129,7 +129,7 @@ class AutofillGroupState extends State<AutofillGroup> with AutofillScopeMixin { ...@@ -129,7 +129,7 @@ class AutofillGroupState extends State<AutofillGroup> with AutofillScopeMixin {
bool _isTopmostAutofillGroup = false; bool _isTopmostAutofillGroup = false;
@override @override
AutofillClient? getAutofillClient(String tag) => _clients[tag]; AutofillClient? getAutofillClient(String autofillId) => _clients[autofillId];
@override @override
Iterable<AutofillClient> get autofillClients { Iterable<AutofillClient> get autofillClients {
......
...@@ -539,10 +539,10 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -539,10 +539,10 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
@override @override
@protected @protected
void setCanDrag(bool canDrag) { void setCanDrag(bool value) {
if (canDrag == _lastCanDrag && (!canDrag || widget.axis == _lastAxisDirection)) if (value == _lastCanDrag && (!value || widget.axis == _lastAxisDirection))
return; return;
if (!canDrag) { if (!value) {
_gestureRecognizers = const <Type, GestureRecognizerFactory>{}; _gestureRecognizers = const <Type, GestureRecognizerFactory>{};
// Cancel the active hold/drag (if any) because the gesture recognizers // Cancel the active hold/drag (if any) because the gesture recognizers
// will soon be disposed by our RawGestureDetector, and we won't be // will soon be disposed by our RawGestureDetector, and we won't be
...@@ -592,7 +592,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -592,7 +592,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
break; break;
} }
} }
_lastCanDrag = canDrag; _lastCanDrag = value;
_lastAxisDirection = widget.axis; _lastAxisDirection = widget.axis;
if (_gestureDetectorKey.currentState != null) if (_gestureDetectorKey.currentState != null)
_gestureDetectorKey.currentState!.replaceGestureRecognizers(_gestureRecognizers); _gestureDetectorKey.currentState!.replaceGestureRecognizers(_gestureRecognizers);
......
...@@ -686,21 +686,21 @@ class ScrollbarPainter extends ChangeNotifier implements CustomPainter { ...@@ -686,21 +686,21 @@ class ScrollbarPainter extends ChangeNotifier implements CustomPainter {
} }
@override @override
bool shouldRepaint(ScrollbarPainter old) { bool shouldRepaint(ScrollbarPainter oldDelegate) {
// Should repaint if any properties changed. // Should repaint if any properties changed.
return color != old.color return color != oldDelegate.color
|| trackColor != old.trackColor || trackColor != oldDelegate.trackColor
|| trackBorderColor != old.trackBorderColor || trackBorderColor != oldDelegate.trackBorderColor
|| textDirection != old.textDirection || textDirection != oldDelegate.textDirection
|| thickness != old.thickness || thickness != oldDelegate.thickness
|| fadeoutOpacityAnimation != old.fadeoutOpacityAnimation || fadeoutOpacityAnimation != oldDelegate.fadeoutOpacityAnimation
|| mainAxisMargin != old.mainAxisMargin || mainAxisMargin != oldDelegate.mainAxisMargin
|| crossAxisMargin != old.crossAxisMargin || crossAxisMargin != oldDelegate.crossAxisMargin
|| radius != old.radius || radius != oldDelegate.radius
|| minLength != old.minLength || minLength != oldDelegate.minLength
|| padding != old.padding || padding != oldDelegate.padding
|| minOverscrollLength != old.minOverscrollLength || minOverscrollLength != oldDelegate.minOverscrollLength
|| scrollbarOrientation != old.scrollbarOrientation; || scrollbarOrientation != oldDelegate.scrollbarOrientation;
} }
@override @override
......
...@@ -3247,14 +3247,14 @@ class InspectorSerializationDelegate implements DiagnosticsSerializationDelegate ...@@ -3247,14 +3247,14 @@ class InspectorSerializationDelegate implements DiagnosticsSerializationDelegate
} }
@override @override
List<DiagnosticsNode> filterChildren(List<DiagnosticsNode> children, DiagnosticsNode owner) { List<DiagnosticsNode> filterChildren(List<DiagnosticsNode> nodes, DiagnosticsNode owner) {
return service._filterChildren(children, this); return service._filterChildren(nodes, this);
} }
@override @override
List<DiagnosticsNode> filterProperties(List<DiagnosticsNode> properties, DiagnosticsNode owner) { List<DiagnosticsNode> filterProperties(List<DiagnosticsNode> nodes, DiagnosticsNode owner) {
final bool createdByLocalProject = _nodesCreatedByLocalProject.contains(owner); final bool createdByLocalProject = _nodesCreatedByLocalProject.contains(owner);
return properties.where((DiagnosticsNode node) { return nodes.where((DiagnosticsNode node) {
return !node.isFiltered(createdByLocalProject ? DiagnosticLevel.fine : DiagnosticLevel.info); return !node.isFiltered(createdByLocalProject ? DiagnosticLevel.fine : DiagnosticLevel.info);
}).toList(); }).toList();
} }
......
...@@ -246,8 +246,8 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { ...@@ -246,8 +246,8 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
String get dateRangeStartDateSemanticLabelRaw; String get dateRangeStartDateSemanticLabelRaw;
@override @override
String dateRangeStartDateSemanticLabel(String fullDate) { String dateRangeStartDateSemanticLabel(String formattedDate) {
return dateRangeStartDateSemanticLabelRaw.replaceFirst(r'$fullDate', fullDate); return dateRangeStartDateSemanticLabelRaw.replaceFirst(r'$fullDate', formattedDate);
} }
/// The raw version of [dateRangeEndDateSemanticLabel], with `$fullDate` verbatim /// The raw version of [dateRangeEndDateSemanticLabel], with `$fullDate` verbatim
...@@ -256,8 +256,8 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { ...@@ -256,8 +256,8 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
String get dateRangeEndDateSemanticLabelRaw; String get dateRangeEndDateSemanticLabelRaw;
@override @override
String dateRangeEndDateSemanticLabel(String fullDate) { String dateRangeEndDateSemanticLabel(String formattedDate) {
return dateRangeEndDateSemanticLabelRaw.replaceFirst(r'$fullDate', fullDate); return dateRangeEndDateSemanticLabelRaw.replaceFirst(r'$fullDate', formattedDate);
} }
/// The raw version of [aboutListTileTitle], with `$applicationName` verbatim /// The raw version of [aboutListTileTitle], with `$applicationName` verbatim
...@@ -646,9 +646,9 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { ...@@ -646,9 +646,9 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
String get remainingTextFieldCharacterCountOther; String get remainingTextFieldCharacterCountOther;
@override @override
String remainingTextFieldCharacterCount(int remainingCount) { String remainingTextFieldCharacterCount(int remaining) {
return intl.Intl.pluralLogic( return intl.Intl.pluralLogic(
remainingCount, remaining,
zero: remainingTextFieldCharacterCountZero, zero: remainingTextFieldCharacterCountZero,
one: remainingTextFieldCharacterCountOne, one: remainingTextFieldCharacterCountOne,
two: remainingTextFieldCharacterCountTwo, two: remainingTextFieldCharacterCountTwo,
...@@ -656,7 +656,7 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { ...@@ -656,7 +656,7 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
few: remainingTextFieldCharacterCountFew, few: remainingTextFieldCharacterCountFew,
other: remainingTextFieldCharacterCountOther, other: remainingTextFieldCharacterCountOther,
locale: _localeName, locale: _localeName,
).replaceFirst(r'$remainingCount', formatDecimal(remainingCount)); ).replaceFirst(r'$remainingCount', formatDecimal(remaining));
} }
@override @override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment