Fix bug and get ready to release. (#164)

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.2.0-dev
+## 2.2.0
 
 * Imports are prefixed with `_i1` rather than `_1` which satisfies the lint
   `lowercase_with_underscores`. While not a strictly breaking change you may
@@ -31,6 +31,27 @@ void main() {
 
 * `literalList` accepts an `Iterable` argument.
 
+* Fixed an NPE when a method had a return type of a `FunctionType`:
+
+```dart
+void main() {
+  test('should create a method with a function type return type', () {
+    expect(
+      new Method((b) => b
+        ..name = 'foo'
+        ..returns = new FunctionType((b) => b
+          ..returnType = refer('String')
+          ..requiredParameters.addAll([
+            refer('int'),
+          ]))),
+      equalsDart(r'''
+        String Function(int) foo();
+      '''),
+    );
+  });
+}
+```
+
 ## 2.1.0
 
 We now require the Dart 2.0-dev branch SDK (`>= 2.0.0-dev`).

lib/src/emitter.dart

@@ -344,7 +344,7 @@ class DartEmitter extends Object
       output.write('static ');
     }
     if (spec.returns != null) {
-      spec.returns.type.accept(this, output);
+      spec.returns.accept(this, output);
       output.write(' ');
     }
     if (spec.type == MethodType.getter) {

pubspec.yaml

@@ -1,5 +1,5 @@
 name: code_builder
-version: 2.2.0-dev
+version: 2.2.0
 description: A fluent API for generating Dart code
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/code_builder

test/specs/method_test.dart

@@ -99,6 +99,21 @@ void main() {
     );
   });
 
+  test('should create a method with a function type return type', () {
+    expect(
+      new Method((b) => b
+        ..name = 'foo'
+        ..returns = new FunctionType((b) => b
+          ..returnType = refer('String')
+          ..requiredParameters.addAll([
+            refer('int'),
+          ]))),
+      equalsDart(r'''
+        String Function(int) foo();
+      '''),
+    );
+  });
+
   test('should create a method with generic types', () {
     expect(
       new Method((b) => b