Skip to content

Commit fb22849

Browse files
DanTupCommit Queue
authored andcommitted
[analysis_server] Extract expected offsets in Extract Local test
Follow-up from https://dart-review.googlesource.com/c/sdk/+/441840. Change-Id: I085099fde59fce052b01fd06a8cc41a83f55ac24 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441941 Reviewed-by: Konstantin Shcheglov <[email protected]> Auto-Submit: Danny Tuppeny <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent dff5fe7 commit fb22849

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import 'package:linter/src/lint_names.dart';
1111
import 'package:test/test.dart';
1212
import 'package:test_reflective_loader/test_reflective_loader.dart';
1313

14+
import '../../../utils/test_code_extensions.dart';
1415
import 'abstract_refactoring.dart';
1516

1617
void main() {
@@ -1181,7 +1182,7 @@ void f() {
11811182
''');
11821183
_assertSingleLinkedEditGroup(
11831184
length: 3,
1184-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1185+
offsets: parsedExpectedCode.positionOffsets,
11851186
names: ['object', 'i'],
11861187
);
11871188
}
@@ -1277,7 +1278,7 @@ void f(int x) {
12771278
''');
12781279
_assertSingleLinkedEditGroup(
12791280
length: 3,
1280-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1281+
offsets: parsedExpectedCode.positionOffsets,
12811282
names: ['object', 'i'],
12821283
);
12831284
}
@@ -1306,7 +1307,7 @@ void f(int x) {
13061307
''');
13071308
_assertSingleLinkedEditGroup(
13081309
length: 3,
1309-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1310+
offsets: parsedExpectedCode.positionOffsets,
13101311
names: ['object', 'i'],
13111312
);
13121313
}
@@ -1491,7 +1492,7 @@ void f() {
14911492
''');
14921493
_assertSingleLinkedEditGroup(
14931494
length: 3,
1494-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1495+
offsets: parsedExpectedCode.positionOffsets,
14951496
names: ['y'],
14961497
);
14971498
}
@@ -1512,7 +1513,7 @@ class Point {int x = 0; int y = 0;}
15121513
''');
15131514
_assertSingleLinkedEditGroup(
15141515
length: 3,
1515-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1516+
offsets: parsedExpectedCode.positionOffsets,
15161517
names: ['x', 'i'],
15171518
);
15181519
}
@@ -1537,7 +1538,7 @@ class Point {int x = 0; int y = 0;}
15371538
''');
15381539
_assertSingleLinkedEditGroup(
15391540
length: 3,
1540-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1541+
offsets: parsedExpectedCode.positionOffsets,
15411542
names: ['x', 'i'],
15421543
);
15431544
}
@@ -1612,7 +1613,7 @@ void f(int x) {
16121613
''');
16131614
_assertSingleLinkedEditGroup(
16141615
length: 3,
1615-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1616+
offsets: parsedExpectedCode.positionOffsets,
16161617
names: ['object', 'i'],
16171618
);
16181619
}
@@ -1639,7 +1640,7 @@ void f(int x) {
16391640
''');
16401641
_assertSingleLinkedEditGroup(
16411642
length: 3,
1642-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1643+
offsets: parsedExpectedCode.positionOffsets,
16431644
names: ['object', 'i'],
16441645
);
16451646
}
@@ -1811,7 +1812,7 @@ void f() {
18111812
''');
18121813
_assertSingleLinkedEditGroup(
18131814
length: 3,
1814-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1815+
offsets: parsedExpectedCode.positionOffsets,
18151816
names: ['cde'],
18161817
);
18171818
}
@@ -1832,7 +1833,7 @@ void f() {
18321833
''');
18331834
_assertSingleLinkedEditGroup(
18341835
length: 3,
1835-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1836+
offsets: parsedExpectedCode.positionOffsets,
18361837
names: ['object', 's'],
18371838
);
18381839
}
@@ -1857,7 +1858,7 @@ void f() {
18571858
''');
18581859
_assertSingleLinkedEditGroup(
18591860
length: 3,
1860-
offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(),
1861+
offsets: parsedExpectedCode.positionOffsets,
18611862
names: ['xy'],
18621863
);
18631864
}

pkg/analysis_server/test/utils/test_code_extensions.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ extension ListTestCodeRangeExtension on List<TestCodeRange> {
2525
}
2626

2727
extension TestCodeExtension on TestCode {
28+
/// Return the offsets of all [positions].
29+
List<int> get positionOffsets => positions.map((p) => p.offset).toList();
30+
2831
/// Verifies that [actualRanges] match with the marked ranges in [code].
2932
///
3033
/// This is done by taking the resulting code (without markers) and then

0 commit comments

Comments
 (0)