Skip to content

Commit f15d01f

Browse files
kevmookevmoo
committed
Migrate double quotes to single quotes
preparing to enable lint: prefer_single_quotes
1 parent 844ce65 commit f15d01f

14 files changed

+72
-73
lines changed

‎lib/src/json_serializable_generator.dart

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class JsonSerializableGenerator
7474
fieldsList.where((fe) => fe.type.isUndefined).toList();
7575
if (undefinedFields.isNotEmpty) {
7676
var description =
77-
undefinedFields.map((fe) => "`${fe.displayName}`").join(', ');
77+
undefinedFields.map((fe) => '`${fe.displayName}`').join(', ');
7878

7979
throw new InvalidGenerationSourceError(
8080
'At least one field has an invalid type: $description.',
@@ -153,13 +153,13 @@ class JsonSerializableGenerator
153153

154154
// TODO(kevmoo) We could write all values up to the null-excluded value
155155
// directly in this literal.
156-
buffer.writeln("var $toJsonMapVarName = <String, dynamic>{};");
156+
buffer.writeln('var $toJsonMapVarName = <String, dynamic>{};');
157157

158-
buffer.writeln("""void $toJsonMapHelperName(String key, dynamic value) {
158+
buffer.writeln('''void $toJsonMapHelperName(String key, dynamic value) {
159159
if (value != null) {
160160
$toJsonMapVarName[key] = value;
161161
}
162-
}""");
162+
}''');
163163

164164
fields.forEach((fieldName, field) {
165165
try {
@@ -173,21 +173,21 @@ class JsonSerializableGenerator
173173
}
174174

175175
if (_includeIfNull(field, includeIfNull)) {
176-
buffer.writeln("$toJsonMapVarName[$safeJsonKeyString] = "
177-
"${_serialize(field.type, fieldName, _nullable(field))};");
176+
buffer.writeln('$toJsonMapVarName[$safeJsonKeyString] = '
177+
'${_serialize(field.type, fieldName, _nullable(field))};');
178178
} else {
179-
buffer.writeln("$toJsonMapHelperName($safeJsonKeyString, "
180-
"${_serialize(field.type, fieldName, _nullable(field))});");
179+
buffer.writeln('$toJsonMapHelperName($safeJsonKeyString, '
180+
'${_serialize(field.type, fieldName, _nullable(field))});');
181181
}
182182
} on UnsupportedTypeError {
183183
throw new InvalidGenerationSourceError(
184-
"Could not generate `toJson` code for `${friendlyNameForElement(
185-
field)}`.",
186-
todo: "Make sure all of the types are serializable.");
184+
'Could not generate `toJson` code for `${friendlyNameForElement(
185+
field)}`.',
186+
todo: 'Make sure all of the types are serializable.');
187187
}
188188
});
189189

190-
buffer.writeln(r"return $map;");
190+
buffer.writeln(r'return $map;');
191191

192192
buffer.writeln('}');
193193
}
@@ -200,12 +200,11 @@ class JsonSerializableGenerator
200200
fields.forEach((fieldName, field) {
201201
try {
202202
pairs.add("'${_fieldToJsonMapKey(field, fieldName)}': "
203-
"${_serialize(field.type, fieldName, _nullable(field))}");
203+
'${_serialize(field.type, fieldName, _nullable(field))}');
204204
} on UnsupportedTypeError {
205205
throw new InvalidGenerationSourceError(
206-
"Could not generate `toJson` code for `${friendlyNameForElement(
207-
field)}`.",
208-
todo: "Make sure all of the types are serializable.");
206+
'Could not generate `toJson` code for `${friendlyNameForElement(field)}`.',
207+
todo: 'Make sure all of the types are serializable.');
209208
}
210209
});
211210
buffer.writeAll(pairs, ', ');
@@ -257,7 +256,7 @@ class JsonSerializableGenerator
257256
.toList();
258257
if (undefinedArgs.isNotEmpty) {
259258
var description =
260-
undefinedArgs.map((fe) => "`${fe.displayName}`").join(', ');
259+
undefinedArgs.map((fe) => '`${fe.displayName}`').join(', ');
261260

262261
throw new InvalidGenerationSourceError(
263262
'At least one constructor argument has an invalid type: $description.',
@@ -301,7 +300,7 @@ class JsonSerializableGenerator
301300
} else {
302301
fieldsToSet.forEach((name, field) {
303302
buffer.writeln();
304-
buffer.write(" ..${name} = ");
303+
buffer.write(' ..${name} = ');
305304
buffer.write(_deserializeForField(name, field));
306305
});
307306
buffer.writeln(';');
@@ -331,11 +330,11 @@ class JsonSerializableGenerator
331330

332331
try {
333332
var safeName = _safeNameAccess(name);
334-
return _deserialize(targetType, "json[$safeName]", _nullable(field));
333+
return _deserialize(targetType, 'json[$safeName]', _nullable(field));
335334
} on UnsupportedTypeError {
336335
throw new InvalidGenerationSourceError(
337-
"Could not generate fromJson code for `${friendlyNameForElement(field)}`.",
338-
todo: "Make sure all of the types are serializable.");
336+
'Could not generate fromJson code for `${friendlyNameForElement(field)}`.',
337+
todo: 'Make sure all of the types are serializable.');
339338
}
340339
}
341340

@@ -369,7 +368,7 @@ JsonKey _jsonKeyFor(FieldElement element) {
369368
var key = _jsonKeyExpando[element];
370369

371370
if (key == null) {
372-
// If an annotation exists on `element` the source is a "real" field.
371+
// If an annotation exists on `element` the source is a 'real' field.
373372
// If the result is `null`, check the getter – it is a property.
374373
// TODO(kevmoo) setters: github.com/dart-lang/json_serializable/issues/24
375374
var obj = _jsonKeyChecker.firstAnnotationOfExact(element) ??

‎lib/src/type_helpers/date_time_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DateTimeHelper extends TypeHelper {
1818
buffer.write('?');
1919
}
2020

21-
buffer.write(".toIso8601String()");
21+
buffer.write('.toIso8601String()');
2222

2323
return buffer.toString();
2424
}
@@ -30,7 +30,7 @@ class DateTimeHelper extends TypeHelper {
3030
}
3131

3232
return commonNullPrefix(
33-
nullable, expression, "DateTime.parse($expression as String)");
33+
nullable, expression, 'DateTime.parse($expression as String)');
3434
}
3535
}
3636

‎lib/src/type_helpers/enum_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class EnumHelper extends TypeHelper {
1010
TypeHelperGenerator serializeNested) {
1111
if (targetType is InterfaceType && targetType.element.isEnum) {
1212
return commonNullPrefix(
13-
nullable, expression, '$expression.toString().split(".")[1]');
13+
nullable, expression, "$expression.toString().split('.')[1]");
1414
}
1515

1616
return null;

‎lib/src/type_helpers/iterable_helper.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:source_gen/source_gen.dart' show TypeChecker;
33
import '../type_helper.dart';
44

55
/// Name used for closure argument when generating calls to `map`.
6-
final _closureArg = "e";
6+
final _closureArg = 'e';
77

88
class IterableHelper extends TypeHelper {
99
const IterableHelper();
@@ -30,7 +30,7 @@ class IterableHelper extends TypeHelper {
3030
if (subFieldValue != _closureArg) {
3131
// TODO: the type could be imported from a library with a prefix!
3232
expression =
33-
"${expression}${optionalQuestion}.map(($_closureArg) => $subFieldValue)";
33+
'${expression}${optionalQuestion}.map(($_closureArg) => $subFieldValue)';
3434

3535
// expression now represents an Iterable (even if it started as a List
3636
// ...resetting `isList` to `false`.
@@ -39,7 +39,7 @@ class IterableHelper extends TypeHelper {
3939

4040
if (!isList) {
4141
// If the static type is not a List, generate one.
42-
expression += "${optionalQuestion}.toList()";
42+
expression += '${optionalQuestion}.toList()';
4343
}
4444

4545
return expression;
@@ -65,10 +65,10 @@ class IterableHelper extends TypeHelper {
6565
var optionalQuestion = nullable ? '?' : '';
6666

6767
var output =
68-
"($expression as List)${optionalQuestion}.map(($_closureArg) => $itemSubVal)";
68+
'($expression as List)${optionalQuestion}.map(($_closureArg) => $itemSubVal)';
6969

7070
if (_coreListChecker.isAssignableFromType(targetType)) {
71-
output += "${optionalQuestion}.toList()";
71+
output += '${optionalQuestion}.toList()';
7272
}
7373

7474
return output;

‎lib/src/type_helpers/json_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class JsonHelper extends TypeHelper {
4242

4343
// TODO: the type could be imported from a library with a prefix!
4444
// github.com/dart-lang/json_serializable/issues/19
45-
var result = "new ${targetType.name}.fromJson($expression$asCast)";
45+
var result = 'new ${targetType.name}.fromJson($expression$asCast)';
4646

4747
return commonNullPrefix(nullable, expression, result);
4848
}

‎lib/src/type_helpers/map_helper.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import '../type_helper.dart';
44
import 'type_helper_utils.dart';
55

66
/// Name used for closure argument when generating calls to `map`.
7-
final _closureArg = "e";
7+
final _closureArg = 'e';
88

99
class MapHelper extends TypeHelper {
1010
const MapHelper();
@@ -38,9 +38,9 @@ class MapHelper extends TypeHelper {
3838

3939
var subFieldValue = serializeNested(valueType, _closureArg, nullable);
4040

41-
var result = "new Map<String, dynamic>.fromIterables("
42-
"$expression.keys,"
43-
"$expression.values.map(($_closureArg) => $subFieldValue))";
41+
var result = 'new Map<String, dynamic>.fromIterables('
42+
'$expression.keys,'
43+
'$expression.values.map(($_closureArg) => $subFieldValue))';
4444

4545
return commonNullPrefix(nullable, expression, result);
4646
}
@@ -75,13 +75,13 @@ class MapHelper extends TypeHelper {
7575
// this is the trivial case. Do a runtime cast to the known type of JSON
7676
// map values - `Map<String, dynamic>`
7777
if (valueArg.isDynamic || valueArg.isObject) {
78-
return "$expression as Map<String, dynamic>";
78+
return '$expression as Map<String, dynamic>';
7979
}
8080

8181
if (simpleJsonTypeChecker.isAssignableFromType(valueArg)) {
8282
// No mapping of the values is required!
8383

84-
var result = "new Map<String, $valueArg>.from($expression as Map)";
84+
var result = 'new Map<String, $valueArg>.from($expression as Map)';
8585
return commonNullPrefix(nullable, expression, result);
8686
}
8787

@@ -90,9 +90,9 @@ class MapHelper extends TypeHelper {
9090

9191
var itemSubVal = deserializeNested(valueArg, _closureArg, nullable);
9292

93-
var result = "new Map<String, $valueArg>.fromIterables("
94-
"($expression as Map<String, dynamic>).keys,"
95-
"($expression as Map).values.map(($_closureArg) => $itemSubVal))";
93+
var result = 'new Map<String, $valueArg>.fromIterables('
94+
'($expression as Map<String, dynamic>).keys,'
95+
'($expression as Map).values.map(($_closureArg) => $itemSubVal))';
9696

9797
return commonNullPrefix(nullable, expression, result);
9898
}

‎lib/src/type_helpers/type_helper_utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
String commonNullPrefix(
22
bool nullable, String expression, String unsafeExpression) =>
33
nullable
4-
? "$expression == null ? null : $unsafeExpression"
4+
? '$expression == null ? null : $unsafeExpression'
55
: unsafeExpression;

‎lib/src/type_helpers/value_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ValueHelper extends TypeHelper {
2121
// just return it as-is. We'll hope it's safe.
2222
return expression;
2323
} else if (simpleJsonTypeChecker.isAssignableFromType(targetType)) {
24-
return "$expression as $targetType";
24+
return '$expression as $targetType';
2525
}
2626

2727
return null;

‎test/ensure_build_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ void main() {
1515
pkgRoot = _runProc('git', ['rev-parse', '--show-toplevel']);
1616
var currentDir = Directory.current.resolveSymbolicLinksSync();
1717
if (pkgRoot != currentDir) {
18-
throw new StateError("Expected the git root ($pkgRoot) "
19-
"to match the current directory ($currentDir).");
18+
throw new StateError('Expected the git root ($pkgRoot) '
19+
'to match the current directory ($currentDir).');
2020
}
2121
} catch (e) {
2222
print("Skipping this test – git didn't run correctly");
2323
print(e);
2424
return;
2525
}
2626

27-
test("ensure local build succeeds with no changes", () {
27+
test('ensure local build succeeds with no changes', () {
2828
// 1 - get a list of modified `.g.dart` files - should be empty
2929
//expect(_changedGeneratedFiles(), isEmpty);
3030

3131
// 2 - run build - should be no output, since nothing should change
3232
var result = _runProc('dart', ['--checked', 'tool/build.dart']);
3333
expect(result,
34-
contains(new RegExp(r"Build: Succeeded after \S+ with \d+ outputs")));
34+
contains(new RegExp(r'Build: Succeeded after \S+ with \d+ outputs')));
3535

3636
// 3 - get a list of modified `.g.dart` files - should still be empty
3737
expect(_changedGeneratedFiles(), isEmpty);

‎test/json_serializable_integration_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ void main() {
1313
roundTripObject(p, (json) => new Person.fromJson(json));
1414
}
1515

16-
test("null", () {
16+
test('null', () {
1717
roundTripPerson(new Person(null, null, null));
1818
});
1919

20-
test("empty", () {
20+
test('empty', () {
2121
roundTripPerson(new Person('', '', null,
2222
middleName: '',
2323
dateOfBirth: new DateTime.fromMillisecondsSinceEpoch(0)));
2424
});
2525

26-
test("now", () {
26+
test('now', () {
2727
roundTripPerson(new Person('a', 'b', House.gryffindor,
2828
middleName: 'c', dateOfBirth: new DateTime.now()));
2929
});
3030

31-
test("now toUtc", () {
31+
test('now toUtc', () {
3232
roundTripPerson(new Person('a', 'b', House.hufflepuff,
3333
middleName: 'c', dateOfBirth: new DateTime.now().toUtc()));
3434
});
@@ -45,17 +45,17 @@ void main() {
4545
roundTripObject(p, (json) => new Order.fromJson(json));
4646
}
4747

48-
test("null", () {
48+
test('null', () {
4949
roundTripOrder(new Order(Category.charmed));
5050
});
5151

52-
test("empty", () {
52+
test('empty', () {
5353
roundTripOrder(new Order(Category.strange, const [])
5454
..count = 0
5555
..isRushed = false);
5656
});
5757

58-
test("simple", () {
58+
test('simple', () {
5959
roundTripOrder(new Order(Category.top, <Item>[
6060
new Item(24)
6161
..itemNumber = 42

‎test/json_serializable_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void main() {
9595

9696
test('class with final fields', () async {
9797
var generateResult = await _runForElementNamed('FinalFields');
98-
expect(generateResult, contains("Map<String, dynamic> toJson()"));
98+
expect(generateResult, contains('Map<String, dynamic> toJson()'));
9999
});
100100

101101
group('valid inputs', () {
@@ -150,14 +150,14 @@ void main() {
150150
expect(output, contains("..height = json['h']"));
151151
});
152152

153-
group("includeIfNull", () {
154-
test("some", () async {
153+
group('includeIfNull', () {
154+
test('some', () async {
155155
var output = await _runForElementNamed('IncludeIfNullAll');
156156
expect(output, isNot(contains(toJsonMapVarName)));
157157
expect(output, isNot(contains(toJsonMapHelperName)));
158158
});
159159

160-
test("all", () async {
160+
test('all', () async {
161161
var output = await _runForElementNamed('IncludeIfNullOverride');
162162
expect(output, contains("$toJsonMapVarName[\'number\'] = number;"));
163163
expect(output, contains("$toJsonMapHelperName('str', str);"));
@@ -201,7 +201,7 @@ void annotatedMethod() => null;
201201
@JsonSerializable()
202202
class Person {
203203
String firstName, lastName;
204-
@JsonKey(name: "h")
204+
@JsonKey(name: 'h')
205205
int height;
206206
DateTime dateOfBirth;
207207
dynamic dynamicType;

0 commit comments

Comments
 (0)