Fix unescaped string usage while generating ValueSourceClass

AUTHORS

@@ -8,3 +8,4 @@ David Morgan/Google Inc. <[email protected]>
 Ivan Inozemtsev/Google Inc. <[email protected]>
 John Dengis <[email protected]>
 Resul Alkan/MetGlobal <[email protected]>
+Dao Hoang Son <[email protected]>

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 7.0.9
+
+- Fix unescaped string usages while generating `ValueSourceClass`.
+
 # 7.0.8
 
 - Fix `analyzer` lower bound: was `0.39.0`, needs to be `0.39.3`.

built_value_generator/lib/src/value_source_class.dart

@@ -12,6 +12,7 @@ import 'package:built_value/built_value.dart';
 import 'package:built_value_generator/src/fixes.dart';
 import 'package:built_value_generator/src/memoized_getter.dart';
 import 'package:built_value_generator/src/value_source_field.dart';
+import 'package:built_value_generator/src/strings.dart';
 import 'package:quiver/iterables.dart';
 import 'package:source_gen/source_gen.dart';
 
@@ -685,7 +686,7 @@ abstract class ValueSourceClass
       for (var field in requiredFields) {
         result.writeln('if (${field.name} == null) {');
         result.writeln(
-            "throw new BuiltValueNullFieldError('$name', '${field.name}');");
+            "throw new BuiltValueNullFieldError('$name', '${escapeString(field.name)}');");
         result.writeln('}');
       }
       // If there are generic parameters, check they are not "dynamic".
@@ -739,7 +740,8 @@ abstract class ValueSourceClass
       } else {
         result.writeln("return (newBuiltValueToStringHelper('$name')");
         result.writeln(fields
-            .map((field) => "..add('${field.name}',  ${field.name})")
+            .map((field) =>
+                "..add('${escapeString(field.name)}',  ${field.name})")
             .join(''));
         result.writeln(').toString();');
       }

end_to_end_test/lib/values.dart

@@ -21,6 +21,9 @@ abstract class SimpleValue implements Built<SimpleValue, SimpleValueBuilder> {
   @nullable
   String get aString;
 
+  @nullable
+  bool get $mustBeEscaped;
+
   factory SimpleValue([void Function(SimpleValueBuilder) updates]) =
       _$SimpleValue;
   SimpleValue._();

end_to_end_test/test/values_serializer_test.dart

@@ -15,13 +15,16 @@ void main() {
   group('SimpleValue', () {
     var data = SimpleValue((b) => b
       ..anInt = 1
-      ..aString = 'two');
+      ..aString = 'two'
+      ..$mustBeEscaped = true);
     var serialized = [
       'SimpleValue',
       'anInt',
       1,
       'aString',
       'two',
+      '\$mustBeEscaped',
+      true,
     ];
 
     test('can be serialized', () {

end_to_end_test/test/values_test.dart

@@ -39,19 +39,24 @@ void main() {
     test('fields can be set via build constructor', () {
       final value = SimpleValue((b) => b
         ..anInt = 1
-        ..aString = 'two');
+        ..aString = 'two'
+        ..$mustBeEscaped = true);
       expect(value.anInt, 1);
       expect(value.aString, 'two');
+      expect(value.$mustBeEscaped, true);
     });
 
     test('fields can be updated via rebuild method', () {
       final value = SimpleValue((b) => b
         ..anInt = 0
-        ..aString = '').rebuild((b) => b
+        ..aString = ''
+        ..$mustBeEscaped = true).rebuild((b) => b
         ..anInt = 1
-        ..aString = 'two');
+        ..aString = 'two'
+        ..$mustBeEscaped = false);
       expect(value.anInt, 1);
       expect(value.aString, 'two');
+      expect(value.$mustBeEscaped, false);
     });
 
     test('builder can be instantiated', () {
@@ -88,8 +93,15 @@ void main() {
     test('hash matches quiver hash', () {
       final value = SimpleValue((b) => b
         ..anInt = 73
-        ..aString = 'seventythree');
-      expect(value.hashCode, hashObjects(<Object>[value.anInt, value.aString]));
+        ..aString = 'seventythree'
+        ..$mustBeEscaped = true);
+      expect(
+          value.hashCode,
+          hashObjects(<Object>[
+            value.anInt,
+            value.aString,
+            value.$mustBeEscaped,
+          ]));
     });
 
     test('hashes equal when equal', () {
@@ -115,10 +127,12 @@ void main() {
     test('has toString', () {
       final value1 = SimpleValue((b) => b
         ..anInt = 0
-        ..aString = '');
+        ..aString = ''
+        ..$mustBeEscaped = true);
       expect(value1.toString(), '''SimpleValue {
   anInt=0,
   aString=,
+  \$mustBeEscaped=true,
 }''');
     });
   });