diff --git a/pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart index cca6196db56..727dd32c9a8 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart @@ -11,6 +11,7 @@ import 'package:linter/src/lint_names.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; +import '../../../utils/test_code_extensions.dart'; import 'abstract_refactoring.dart'; void main() { @@ -1181,7 +1182,7 @@ void f() { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 'i'], ); } @@ -1277,7 +1278,7 @@ void f(int x) { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 'i'], ); } @@ -1306,7 +1307,7 @@ void f(int x) { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 'i'], ); } @@ -1491,7 +1492,7 @@ void f() { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['y'], ); } @@ -1512,7 +1513,7 @@ class Point {int x = 0; int y = 0;} '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['x', 'i'], ); } @@ -1537,7 +1538,7 @@ class Point {int x = 0; int y = 0;} '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['x', 'i'], ); } @@ -1612,7 +1613,7 @@ void f(int x) { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 'i'], ); } @@ -1639,7 +1640,7 @@ void f(int x) { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 'i'], ); } @@ -1811,7 +1812,7 @@ void f() { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['cde'], ); } @@ -1832,7 +1833,7 @@ void f() { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['object', 's'], ); } @@ -1857,7 +1858,7 @@ void f() { '''); _assertSingleLinkedEditGroup( length: 3, - offsets: parsedExpectedCode.positions.map((p) => p.offset).toList(), + offsets: parsedExpectedCode.positionOffsets, names: ['xy'], ); } diff --git a/pkg/analysis_server/test/utils/test_code_extensions.dart b/pkg/analysis_server/test/utils/test_code_extensions.dart index 5cdac0a41d9..0a2b2d6c256 100644 --- a/pkg/analysis_server/test/utils/test_code_extensions.dart +++ b/pkg/analysis_server/test/utils/test_code_extensions.dart @@ -25,6 +25,9 @@ extension ListTestCodeRangeExtension on List { } extension TestCodeExtension on TestCode { + /// Return the offsets of all [positions]. + List get positionOffsets => positions.map((p) => p.offset).toList(); + /// Verifies that [actualRanges] match with the marked ranges in [code]. /// /// This is done by taking the resulting code (without markers) and then