Merge pull request #1 from davidmorgan/minor-fixes

Fix error message for missing builder class. Allow non-abstract getters, don't count them as fields.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.2
+
+- Fix error message for missing builder class.
+- Allow non-abstract getters in value class.
+
 ## 0.0.1
 
 - Generator, tests and example.

built_value/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value
-version: 0.0.1
+version: 0.0.2
 description: >
   Value types with builders. This library is the runtime dependency.
 authors:

built_value_generator/lib/built_value_generator.dart

@@ -20,6 +20,7 @@ class BuiltValueGenerator extends Generator {
       return null;
     }
     final classElement = element as ClassElement;
+    final className = classElement.displayName;
 
     // TODO(davidmorgan): more exact type check.
     if (!classElement.allSupertypes
@@ -39,7 +40,7 @@ class BuiltValueGenerator extends Generator {
     final errors = concat([
       checkPart(classElement),
       checkValueClass(classElement),
-      checkBuilderClass(builderClassElement),
+      checkBuilderClass(className, builderClassElement),
       checkFields(fields, builderFields),
     ]);
 
@@ -49,7 +50,7 @@ class BuiltValueGenerator extends Generator {
           todo: errors.join(' '));
     }
 
-    return generateCode(classElement.displayName, fields, builderFields);
+    return generateCode(className, fields, builderFields);
   }
 
   Iterable<String> checkPart(ClassElement classElement) {
@@ -91,9 +92,10 @@ class BuiltValueGenerator extends Generator {
     return result;
   }
 
-  Iterable<String> checkBuilderClass(ClassElement classElement) {
+  Iterable<String> checkBuilderClass(
+      String className, ClassElement classElement) {
     if (classElement == null) {
-      return <String>['Add abstract class ValueBuilder'];
+      return <String>['Add abstract class ${className}Builder'];
     }
 
     final result = <String>[];
@@ -128,7 +130,8 @@ class BuiltValueGenerator extends Generator {
   List<FieldElement> getFields(ClassElement classElement) {
     final result = <FieldElement>[];
     for (final field in classElement.fields) {
-      if (!field.isStatic) result.add(field);
+      if (!field.isStatic && field.getter.isAbstract ||
+          field.getter.isSynthetic) result.add(field);
     }
     return result;
   }
@@ -148,13 +151,15 @@ class BuiltValueGenerator extends Generator {
       Iterable<FieldElement> fields, Iterable<FieldElement> builderFields) {
     final result = <String>[];
     var checkFieldTypes = true;
+
     for (final field in fields) {
       final fieldName = field.displayName;
-      if (field.getter == null || !field.getter.isAbstract) {
+      if (field.getter == null || field.getter.isSynthetic) {
         checkFieldTypes = false;
-        result.add('Make field $fieldName an abstract getter');
+        result.add('Make field $fieldName a getter');
       }
     }
+
     for (final field in builderFields) {
       final fieldName = field.displayName;
       if (field.getter == null ||

built_value_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value_generator
-version: 0.0.1
+version: 0.0.2
 description: >
   Value types with builders. This library is the dev dependency.
 authors:
@@ -12,7 +12,7 @@ environment:
 dependencies:
   analyzer: '>=0.26.1 <1.0.0'
   built_collection: '^1.0.0'
-  built_value: '^0.0.1'
+  built_value: '^0.0.2'
   source_gen: '>=0.4.3 <1.0.0'
   quiver: '>=0.21.0 <0.22.0'
 

built_value_generator/test/built_value_generator_test.dart

@@ -141,7 +141,7 @@ abstract class ValueBuilder extends Builder<Value, ValueBuilder> {
   factory ValueBuilder() = _\$ValueBuilder;
   int foo;
 }'''),
-          contains("TODO: Make field foo an abstract getter"));
+          contains("TODO: Make field foo a getter"));
     });
 
     test('suggests builder fields must be getters', () async {

example/pubspec.yaml

@@ -1,5 +1,5 @@
 name: example
-version: 0.0.1
+version: 0.0.2
 description: >
   Just an example, not for publishing.
 authors:
@@ -11,8 +11,8 @@ environment:
 
 dependencies:
   built_collection: '^1.0.0'
-  built_value: '^0.0.1'
+  built_value: '^0.0.2'
 
 dev_dependencies:
-  built_value_generator: '^0.0.1'
+  built_value_generator: '^0.0.2'
   test: any