Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit baf8686

Browse files
authored
Consistently capitalize Endpoint (not EndPoint) (#106706)
1 parent bbdf617 commit baf8686

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

packages/flutter/lib/src/widgets/selectable_region.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD
514514
onEndHandleDragStart: _handleSelectionEndHandleDragStart,
515515
onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate,
516516
onEndHandleDragEnd: (DragEndDetails details) => _stopSelectionEndEdgeUpdate(),
517-
selectionEndPoints: points,
517+
selectionEndpoints: points,
518518
selectionControls: widget.selectionControls,
519519
selectionDelegate: this,
520520
clipboardStatus: null,
@@ -550,7 +550,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD
550550
..lineHeightAtStart = start?.lineHeight ?? end!.lineHeight
551551
..endHandleType = end?.handleType ?? TextSelectionHandleType.right
552552
..lineHeightAtEnd = end?.lineHeight ?? start!.lineHeight
553-
..selectionEndPoints = points;
553+
..selectionEndpoints = points;
554554
}
555555

556556
/// Shows the selection handles.

packages/flutter/lib/src/widgets/text_selection.dart

+14-14
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class TextSelectionOverlay {
258258
onEndHandleDragStart: _handleSelectionEndHandleDragStart,
259259
onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate,
260260
toolbarVisible: _effectiveToolbarVisibility,
261-
selectionEndPoints: const <TextSelectionPoint>[],
261+
selectionEndpoints: const <TextSelectionPoint>[],
262262
selectionControls: selectionControls,
263263
selectionDelegate: selectionDelegate,
264264
clipboardStatus: clipboardStatus,
@@ -373,7 +373,7 @@ class TextSelectionOverlay {
373373
)
374374
..lineHeightAtEnd = _getEndGlyphHeight()
375375
// Update selection toolbar metrics.
376-
..selectionEndPoints = renderObject.getEndpointsForSelection(_selection)
376+
..selectionEndpoints = renderObject.getEndpointsForSelection(_selection)
377377
..toolbarLocation = renderObject.lastSecondaryTapDownPosition;
378378
}
379379

@@ -589,7 +589,7 @@ class SelectionOverlay {
589589
this.onEndHandleDragUpdate,
590590
this.onEndHandleDragEnd,
591591
this.toolbarVisible,
592-
required List<TextSelectionPoint> selectionEndPoints,
592+
required List<TextSelectionPoint> selectionEndpoints,
593593
required this.selectionControls,
594594
required this.selectionDelegate,
595595
required this.clipboardStatus,
@@ -603,7 +603,7 @@ class SelectionOverlay {
603603
_lineHeightAtStart = lineHeightAtStart,
604604
_endHandleType = endHandleType,
605605
_lineHeightAtEnd = lineHeightAtEnd,
606-
_selectionEndPoints = selectionEndPoints,
606+
_selectionEndpoints = selectionEndpoints,
607607
_toolbarLocation = toolbarLocation {
608608
final OverlayState? overlay = Overlay.of(context, rootOverlay: true);
609609
assert(
@@ -721,13 +721,13 @@ class SelectionOverlay {
721721
final ValueListenable<bool>? toolbarVisible;
722722

723723
/// The text selection positions of selection start and end.
724-
List<TextSelectionPoint> get selectionEndPoints => _selectionEndPoints;
725-
List<TextSelectionPoint> _selectionEndPoints;
726-
set selectionEndPoints(List<TextSelectionPoint> value) {
727-
if (!listEquals(_selectionEndPoints, value)) {
724+
List<TextSelectionPoint> get selectionEndpoints => _selectionEndpoints;
725+
List<TextSelectionPoint> _selectionEndpoints;
726+
set selectionEndpoints(List<TextSelectionPoint> value) {
727+
if (!listEquals(_selectionEndpoints, value)) {
728728
_markNeedsBuild();
729729
}
730-
_selectionEndPoints = value;
730+
_selectionEndpoints = value;
731731
}
732732

733733
/// Debugging information for explaining why the [Overlay] is required.
@@ -800,7 +800,7 @@ class SelectionOverlay {
800800
/// The location of where the toolbar should be drawn in relative to the
801801
/// location of [toolbarLayerLink].
802802
///
803-
/// If this is null, the toolbar is drawn based on [selectionEndPoints] and
803+
/// If this is null, the toolbar is drawn based on [selectionEndpoints] and
804804
/// the rect of render object of [context].
805805
///
806806
/// This is useful for displaying toolbars at the mouse right-click locations
@@ -988,19 +988,19 @@ class SelectionOverlay {
988988
renderBox.localToGlobal(renderBox.size.bottomRight(Offset.zero)),
989989
);
990990

991-
final bool isMultiline = selectionEndPoints.last.point.dy - selectionEndPoints.first.point.dy >
991+
final bool isMultiline = selectionEndpoints.last.point.dy - selectionEndpoints.first.point.dy >
992992
lineHeightAtEnd / 2;
993993

994994
// If the selected text spans more than 1 line, horizontally center the toolbar.
995995
// Derived from both iOS and Android.
996996
final double midX = isMultiline
997997
? editingRegion.width / 2
998-
: (selectionEndPoints.first.point.dx + selectionEndPoints.last.point.dx) / 2;
998+
: (selectionEndpoints.first.point.dx + selectionEndpoints.last.point.dx) / 2;
999999

10001000
final Offset midpoint = Offset(
10011001
midX,
10021002
// The y-coordinate won't be made use of most likely.
1003-
selectionEndPoints.first.point.dy - lineHeightAtStart,
1003+
selectionEndpoints.first.point.dy - lineHeightAtStart,
10041004
);
10051005

10061006
return Directionality(
@@ -1012,7 +1012,7 @@ class SelectionOverlay {
10121012
editingRegion: editingRegion,
10131013
selectionControls: selectionControls,
10141014
midpoint: midpoint,
1015-
selectionEndpoints: selectionEndPoints,
1015+
selectionEndpoints: selectionEndpoints,
10161016
visibility: toolbarVisible,
10171017
selectionDelegate: selectionDelegate,
10181018
clipboardStatus: clipboardStatus,

packages/flutter/test/widgets/text_selection_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ void main() {
10411041
clipboardStatus: FakeClipboardStatusNotifier(),
10421042
selectionDelegate: FakeTextSelectionDelegate(),
10431043
selectionControls: selectionControls,
1044-
selectionEndPoints: const <TextSelectionPoint>[],
1044+
selectionEndpoints: const <TextSelectionPoint>[],
10451045
toolbarLayerLink: toolbarLayerLink,
10461046
);
10471047
}
@@ -1055,7 +1055,7 @@ void main() {
10551055
selectionOverlay
10561056
..startHandleType = TextSelectionHandleType.left
10571057
..endHandleType = TextSelectionHandleType.right
1058-
..selectionEndPoints = const <TextSelectionPoint>[
1058+
..selectionEndpoints = const <TextSelectionPoint>[
10591059
TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
10601060
TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
10611061
];
@@ -1100,7 +1100,7 @@ void main() {
11001100
selectionOverlay
11011101
..startHandleType = TextSelectionHandleType.collapsed
11021102
..endHandleType = TextSelectionHandleType.collapsed
1103-
..selectionEndPoints = const <TextSelectionPoint>[
1103+
..selectionEndpoints = const <TextSelectionPoint>[
11041104
TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
11051105
TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
11061106
];
@@ -1122,7 +1122,7 @@ void main() {
11221122
..lineHeightAtStart = 10.0
11231123
..endHandleType = TextSelectionHandleType.right
11241124
..lineHeightAtEnd = 11.0
1125-
..selectionEndPoints = const <TextSelectionPoint>[
1125+
..selectionEndpoints = const <TextSelectionPoint>[
11261126
TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
11271127
TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
11281128
];
@@ -1159,7 +1159,7 @@ void main() {
11591159
..lineHeightAtStart = 10.0
11601160
..endHandleType = TextSelectionHandleType.right
11611161
..lineHeightAtEnd = 11.0
1162-
..selectionEndPoints = const <TextSelectionPoint>[
1162+
..selectionEndpoints = const <TextSelectionPoint>[
11631163
TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
11641164
TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
11651165
];
@@ -1206,7 +1206,7 @@ void main() {
12061206
..lineHeightAtStart = 10.0
12071207
..endHandleType = TextSelectionHandleType.right
12081208
..lineHeightAtEnd = 11.0
1209-
..selectionEndPoints = const <TextSelectionPoint>[
1209+
..selectionEndpoints = const <TextSelectionPoint>[
12101210
TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
12111211
TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
12121212
];

0 commit comments

Comments
 (0)