Update TestCode, change 'rawCode' to 'markedCode'.
In my head "raw" means without markers.
So, the previous naming was confusing.
Change-Id: I54d366cb406f7ba5487ae0bb2a7f800b2fccea84
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352985
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/src/services/refactoring/move_top_level_to_file_test.dart b/pkg/analysis_server/test/src/services/refactoring/move_top_level_to_file_test.dart
index f94080b..751f3fb 100644
--- a/pkg/analysis_server/test/src/services/refactoring/move_top_level_to_file_test.dart
+++ b/pkg/analysis_server/test/src/services/refactoring/move_top_level_to_file_test.dart
@@ -1834,7 +1834,7 @@
var originalSource = '''
import 'package:test/other.dart' as other;
-${code.rawCode}
+${code.markedCode}
''';
var expected = '''
diff --git a/pkg/analyzer/lib/src/test_utilities/test_code_format.dart b/pkg/analyzer/lib/src/test_utilities/test_code_format.dart
index 31222f5..0d65942 100644
--- a/pkg/analyzer/lib/src/test_utilities/test_code_format.dart
+++ b/pkg/analyzer/lib/src/test_utilities/test_code_format.dart
@@ -26,15 +26,19 @@
static final _positionShorthand = '^';
static final _rangeStartShorthand = '[!';
static final _rangeEndShorthand = '!]';
- static final _positionPattern = RegExp(r'\/\*(\d+)\*\/');
- static final _rangeStartPattern = RegExp(r'\/\*\[(\d+)\*\/');
- static final _rangeEndPattern = RegExp(r'\/\*(\d+)\]\*\/');
+ static final _positionPattern = RegExp(r'/\*(\d+)\*/');
+ static final _rangeStartPattern = RegExp(r'/\*\[(\d+)\*/');
+ static final _rangeEndPattern = RegExp(r'/\*(\d+)\]\*/');
/// An empty code block with a single position at offset 0.
static final empty = TestCode.parse('^');
+ /// The code with markers removed.
final String code;
- final String rawCode;
+
+ /// The code with markers like `^`.
+ /// These markers are used to fill [positions] and [ranges].
+ final String markedCode;
/// A map of positions marked in code, indexed by their number.
final List<TestCodePosition> positions;
@@ -43,7 +47,7 @@
final List<TestCodeRange> ranges;
TestCode._({
- required this.rawCode,
+ required this.markedCode,
required this.code,
required this.positions,
required this.ranges,
@@ -53,11 +57,11 @@
TestCodeRange get range => ranges.single;
static TestCode parse(
- String rawCode, {
+ String markedCode, {
bool positionShorthand = true,
bool rangeShorthand = true,
}) {
- final scanner = _StringScanner(rawCode);
+ final scanner = _StringScanner(markedCode);
final codeBuffer = StringBuffer();
final positionOffsets = <int, int>{};
final rangeStartOffsets = <int, int>{};
@@ -149,7 +153,7 @@
return TestCode._(
code: code,
- rawCode: rawCode,
+ markedCode: markedCode,
positions: positions.values.toList(),
ranges: ranges.values.toList(),
);
diff --git a/pkg/analyzer/test/src/test_utilities/test_code_format_test.dart b/pkg/analyzer/test/src/test_utilities/test_code_format_test.dart
index 8f05e5f..89e9acf 100644
--- a/pkg/analyzer/test/src/test_utilities/test_code_format_test.dart
+++ b/pkg/analyzer/test/src/test_utilities/test_code_format_test.dart
@@ -16,18 +16,18 @@
@reflectiveTest
class TestCodeFormatTest {
void test_noMarkers() {
- final rawCode = '''
+ final markedCode = '''
int a = 1;
''';
- final code = TestCode.parse(rawCode);
- expect(code.rawCode, rawCode);
- expect(code.code, rawCode); // no difference
+ final code = TestCode.parse(markedCode);
+ expect(code.markedCode, markedCode);
+ expect(code.code, markedCode); // no difference
expect(code.positions, isEmpty);
expect(code.ranges, isEmpty);
}
void test_positions() {
- final rawCode = '''
+ final markedCode = '''
int /*0*/a = 1;/*1*/
int b/*2*/ = 2;
''';
@@ -35,8 +35,8 @@
int a = 1;
int b = 2;
''';
- final code = TestCode.parse(rawCode);
- expect(code.rawCode, rawCode);
+ final code = TestCode.parse(markedCode);
+ expect(code.markedCode, markedCode);
expect(code.code, expectedCode);
expect(code.ranges, isEmpty);
@@ -46,14 +46,14 @@
}
void test_positions_nonShorthandCaret() {
- final rawCode = '''
+ final markedCode = '''
String /*0*/a = '^^^';
''';
final expectedCode = '''
String a = '^^^';
''';
- final code = TestCode.parse(rawCode, positionShorthand: false);
- expect(code.rawCode, rawCode);
+ final code = TestCode.parse(markedCode, positionShorthand: false);
+ expect(code.markedCode, markedCode);
expect(code.code, expectedCode);
expect(code.positions, hasLength(1));
@@ -64,21 +64,21 @@
}
void test_positions_numberReused() {
- final rawCode = '''
+ final markedCode = '''
/*0*/ /*1*/ /*0*/
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_positions_shorthand() {
- final rawCode = '''
+ final markedCode = '''
int ^a = 1
''';
final expectedCode = '''
int a = 1
''';
- final code = TestCode.parse(rawCode);
- expect(code.rawCode, rawCode);
+ final code = TestCode.parse(markedCode);
+ expect(code.markedCode, markedCode);
expect(code.code, expectedCode);
expect(code.positions, hasLength(1));
@@ -89,21 +89,21 @@
}
void test_positions_shorthandReused() {
- final rawCode = '''
+ final markedCode = '''
^ ^
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_positions_shorthandReusedNumber() {
- final rawCode = '''
+ final markedCode = '''
/*0*/ ^
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges() {
- final rawCode = '''
+ final markedCode = '''
int /*[0*/a = 1;/*0]*/
/*[1*/int b = 2;/*1]*/
''';
@@ -111,8 +111,8 @@
int a = 1;
int b = 2;
''';
- final code = TestCode.parse(rawCode);
- expect(code.rawCode, rawCode);
+ final code = TestCode.parse(markedCode);
+ expect(code.markedCode, markedCode);
expect(code.code, expectedCode);
expect(code.positions, isEmpty);
@@ -125,34 +125,34 @@
}
void test_ranges_endReused() {
- final rawCode = '''
+ final markedCode = '''
/*[0*/ /*0]*/
/*[1*/ /*0]*/
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges_endWithoutStart() {
- final rawCode = '''
+ final markedCode = '''
/*0]*/
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges_nonShorthandMarkers() {
- final rawCode = '''
+ final markedCode = '''
String a = '[!not markers!]';
''';
- final code = TestCode.parse(rawCode, rangeShorthand: false);
- expect(code.rawCode, rawCode);
- expect(code.code, rawCode); // No change.
+ final code = TestCode.parse(markedCode, rangeShorthand: false);
+ expect(code.markedCode, markedCode);
+ expect(code.code, markedCode); // No change.
expect(code.positions, isEmpty);
expect(code.ranges, isEmpty);
}
void test_ranges_shorthand() {
- final rawCode = '''
+ final markedCode = '''
int [!a = 1;!]
int b = 2;
''';
@@ -160,8 +160,8 @@
int a = 1;
int b = 2;
''';
- final code = TestCode.parse(rawCode);
- expect(code.rawCode, rawCode);
+ final code = TestCode.parse(markedCode);
+ expect(code.markedCode, markedCode);
expect(code.code, expectedCode);
expect(code.positions, isEmpty);
@@ -172,33 +172,33 @@
}
void test_ranges_shorthandReused() {
- final rawCode = '''
+ final markedCode = '''
int [!a = 1;!]
int [!b = 2!];
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges_shorthandReusedNumber() {
- final rawCode = '''
+ final markedCode = '''
int [!a = 1;!]
int /*[0*/b = 2/*0]*/;
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges_startReused() {
- final rawCode = '''
+ final markedCode = '''
/*[0*/ /*0]*/
/*[0*/ /*1]*/
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
void test_ranges_startWithoutEnd() {
- final rawCode = '''
+ final markedCode = '''
/*[0*/
''';
- expect(() => TestCode.parse(rawCode), throwsArgumentError);
+ expect(() => TestCode.parse(markedCode), throwsArgumentError);
}
}
