Merge pull request #74 from davidmorgan/fix-warnings

Fix analyzer issues and generator crash.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1
+
+- Fix some analyzer hints.
+- Fix exception from serializer generator if builder field is incorrect.
+
 ## 0.4.0
 
 - Add benchmark for updating deeply nested data structures.

benchmark/lib/benchmark.dart

@@ -21,16 +21,15 @@ void benchmarkNestedRebuilds() {
   for (var depth = 0; depth != 10; ++depth) {
     final value = new Node((b) => _buildNested(b, depth));
 
-    _benchmark('nested rebuild $depth',
-        () {
-          final topBuilder = value.toBuilder();
-          var leafBuilder = topBuilder;
-          for (int i = 0; i != depth; ++i) {
-            leafBuilder = leafBuilder.left;
-          }
-          leafBuilder.label = 'updatedLeaf';
-          topBuilder.build();
-        });
+    _benchmark('nested rebuild $depth', () {
+      final topBuilder = value.toBuilder();
+      var leafBuilder = topBuilder;
+      for (int i = 0; i != depth; ++i) {
+        leafBuilder = leafBuilder.left;
+      }
+      leafBuilder.label = 'updatedLeaf';
+      topBuilder.build();
+    });
   }
 }
 

benchmark/pubspec.yaml

@@ -1,5 +1,5 @@
 name: benchmark
-version: 0.4.0
+version: 0.4.1
 description: >
   Benchmark, not for publishing.
 authors:
@@ -12,11 +12,15 @@ environment:
 dependencies:
   browser: any
   built_collection: '^1.0.0'
-  built_value: '^0.4.0'
+# built_value: '^0.4.1'
+  built_value:
+    path: ../built_value
 
 dev_dependencies:
   build: '^0.4.0'
-  built_value_generator: '^0.4.0'
+# built_value_generator: '^0.4.1'
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: '>=0.5.0+03 <0.6.0'
   quiver: '>=0.21.0 <0.24.0'
   test: any

built_value/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value
-version: 0.4.0
+version: 0.4.1
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the runtime dependency.

built_value_generator/lib/src/enum_source_class.dart

@@ -9,7 +9,6 @@ import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 import 'package:built_value_generator/src/enum_source_field.dart';
 import 'package:quiver/iterables.dart';
-import 'package:meta/meta.dart';
 
 part 'enum_source_class.g.dart';
 

built_value_generator/lib/src/enum_source_field.dart

@@ -7,7 +7,6 @@ library built_value_generator.enum_source_field;
 import 'package:analyzer/dart/element/element.dart';
 import 'package:built_collection/src/list.dart';
 import 'package:built_value/built_value.dart';
-import 'package:meta/meta.dart';
 
 part 'enum_source_field.g.dart';
 

built_value_generator/lib/src/enum_source_library.dart

@@ -9,7 +9,6 @@ import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 import 'package:built_value_generator/src/enum_source_class.dart';
 import 'package:built_value_generator/src/library_elements.dart';
-import 'package:meta/meta.dart';
 import 'package:quiver/iterables.dart';
 import 'package:source_gen/source_gen.dart';
 

built_value_generator/lib/src/serializer_source_class.dart

@@ -8,7 +8,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 import 'package:built_value_generator/src/serializer_source_field.dart';
-import 'package:meta/meta.dart';
 
 part 'serializer_source_class.g.dart';
 

built_value_generator/lib/src/serializer_source_field.dart

@@ -58,13 +58,17 @@ abstract class SerializerSourceField
       result.name = fieldElement.displayName;
       result.type = fieldElement.getter.returnType.displayName;
 
+      final builderFieldElementIsValid =
+          (builderFieldElement?.getter?.isAbstract ?? false) &&
+              !builderFieldElement.isStatic;
+
       // If the builder is present, check it to determine whether a nested
       // builder is needed. Otherwise, use the same logic as built_value when
       // it decides whether to use a nested builder.
-      result.builderFieldUsesNestedBuilder = builderFieldElement == null
-          ? _needsNestedBuilder(fieldElement.getter.returnType)
-          : fieldElement.getter.returnType.displayName !=
-              builderFieldElement.getter.returnType.displayName;
+      result.builderFieldUsesNestedBuilder = builderFieldElementIsValid
+          ? fieldElement.getter.returnType.displayName !=
+              builderFieldElement.getter.returnType.displayName
+          : _needsNestedBuilder(fieldElement.getter.returnType);
     }
 
     return result.build();

built_value_generator/lib/src/value_source_field.dart

@@ -8,7 +8,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
-import 'package:meta/meta.dart';
 
 part 'value_source_field.g.dart';
 

built_value_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value_generator
-version: 0.4.0
+version: 0.4.1
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the dev dependency.
@@ -12,9 +12,11 @@ environment:
 
 dependencies:
   analyzer: '>=0.28.0 <0.29.0'
-  build: '^0.4.0'
+  build: '^0.4.1'
   built_collection: '^1.0.0'
-  built_value: '^0.4.0'
+#  built_value: '^0.4.1'
+  built_value:
+    path: ../built_value
   meta: '^1.0.4'
   source_gen: '>=0.5.0+03 <0.6.0'
   quiver: '>=0.21.0 <0.24.0'

built_value_generator/test/serializer_generator_test.dart

@@ -436,6 +436,23 @@ class _$TestEnumSerializer implements PrimitiveSerializer<TestEnum> {
 }
 '''));
     });
+
+    test('does not crash for incorrect builder getter', () async {
+      expect(await generate(r'''
+library value;
+
+import 'package:test_support/test_support.dart';
+
+abstract class Value implements Built<Value, ValueBuilder> {
+  static final Serializer<Value> serializer = _$serializer;
+  bool get aBool;
+}
+
+abstract class ValueBuilder implements Builder<Value, ValueBuilder> {
+  set aBool(bool aBool);
+}
+'''), contains('Serializer<Value>'));
+    });
   });
 }
 

chat_example/pubspec.yaml

@@ -1,5 +1,5 @@
 name: chat_example
-version: 0.4.0
+version: 0.4.1
 description: >
   Just an example, not for publishing.
 authors:
@@ -11,12 +11,16 @@ environment:
 
 dependencies:
   built_collection: '^1.0.0'
-  built_value: '^0.4.0'
+# built_value: '^0.4.1'
+  built_value:
+    path: ../built_value
   package_resolver: ^1.0.0
   route: '>=0.4.6'
 
 dev_dependencies:
   build: '^0.4.0'
-  built_value_generator: '^0.4.0'
+# built_value_generator: '^0.4.1'
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: '>=0.5.0+03 <0.6.0'
   test: any

example/pubspec.yaml

@@ -1,5 +1,5 @@
 name: example
-version: 0.4.0
+version: 0.4.1
 description: >
   Just an example, not for publishing.
 authors:
@@ -12,11 +12,15 @@ environment:
 dependencies:
   meta: '^1.0.4'
   built_collection: '^1.0.0'
-  built_value: '^0.4.0'
+# built_value: '^0.4.1'
+  built_value:
+    path: ../built_value
 
 dev_dependencies:
   build: '^0.4.0'
-  built_value_generator: '^0.4.0'
+# built_value_generator: '^0.4.1'
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: '>=0.5.0+03 <0.6.0'
   quiver: '>=0.21.0 <0.24.0'
   test: any