Remove deprecated code and classes.

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.0.0-alpha
+
+* Using `equalsDart` no longer formats automatically with `dartfmt`.
+
+* Removed deprecated `Annotation` and `File` classes.
+
+* `Method.lambda` is inferred based on `Method.body` where possible and now
+  defaults to `null`.
+
 ## 2.4.0
 
 * Add `equalTo`, `notEqualTo`, `greaterThan`, `lessThan`, `greateOrEqualTo`, and

README.md

@@ -25,7 +25,6 @@ void main() {
     ..extend = refer('Organism')
     ..methods.add(new Method.returnsVoid((b) => b
       ..name = 'eat'
-      ..lambda = true
       ..body = const Code('print(\'Yum\')'))));
   final emitter = new DartEmitter();
   print(new DartFormatter().format('${animal.accept(emitter)}'));

example/example.dart

@@ -25,7 +25,6 @@ String animalClass() {
     ..extend = refer('Organism')
     ..methods.add(new Method.returnsVoid((b) => b
       ..name = 'eat'
-      ..lambda = null
       ..body = refer('print').call([literalString('Yum!')]).code)));
   return _dartfmt.format('${animal.accept(new DartEmitter())}');
 }

lib/code_builder.dart

@@ -7,8 +7,6 @@ export 'src/base.dart' show lazySpec, Spec;
 export 'src/emitter.dart' show DartEmitter;
 export 'src/matchers.dart' show equalsDart, EqualsDart;
 export 'src/matchers.dart' show equalsDart;
-// ignore: deprecated_member_use
-export 'src/specs/annotation.dart' show Annotation, AnnotationBuilder;
 export 'src/specs/class.dart' show Class, ClassBuilder;
 export 'src/specs/code.dart'
     show lazyCode, Block, BlockBuilder, Code, StaticCode, ScopedCode;
@@ -38,9 +36,7 @@ export 'src/specs/expression.dart'
         literalTrue,
         literalFalse;
 export 'src/specs/field.dart' show Field, FieldBuilder, FieldModifier;
-// TODO: Remove File, FileBuilder in 3.0.0.
-// ignore: deprecated_member_use
-export 'src/specs/library.dart' show File, FileBuilder, Library, LibraryBuilder;
+export 'src/specs/library.dart' show Library, LibraryBuilder;
 export 'src/specs/method.dart'
     show
         Method,

lib/src/emitter.dart

@@ -6,7 +6,6 @@ import 'package:meta/meta.dart';
 
 import 'allocator.dart';
 import 'base.dart';
-import 'specs/annotation.dart';
 import 'specs/class.dart';
 import 'specs/code.dart';
 import 'specs/constructor.dart';
@@ -79,11 +78,7 @@ class DartEmitter extends Object
   @override
   visitAnnotation(Expression spec, [StringSink output]) {
     (output ??= new StringBuffer()).write('@');
-    if (spec is Annotation) {
-      spec.code.accept(this, output);
-    } else {
-      spec.accept(this, output);
-    }
+    spec.accept(this, output);
     output.write(' ');
     return output;
   }
@@ -281,12 +276,7 @@ class DartEmitter extends Object
   }
 
   @override
-  visitLibrary(Library spec, [StringSink output]) => visitFile(spec, output);
-
-  @override
-  // TODO: Remove File in 3.0.0.
-  // ignore: deprecated_member_use
-  visitFile(File spec, [StringSink output]) {
+  visitLibrary(Library spec, [StringSink output]) {
     output ??= new StringBuffer();
     // Process the body first in order to prime the allocators.
     final body = new StringBuffer();

lib/src/matchers.dart

@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:dart_style/dart_style.dart';
 import 'package:matcher/matcher.dart';
 
 import 'base.dart';
@@ -23,23 +22,13 @@ Matcher equalsDart(
 ///
 /// See [EqualsDart.format] to specify the default source code formatter.
 class EqualsDart extends Matcher {
-  // TODO: Remove in 3.0.0.
-  static final _formatter = new DartFormatter();
-
   /// May override to provide a function to format Dart on [equalsDart].
   ///
-  /// As of `2.x.x`, this defaults to using `dartfmt`, but in an upcoming
-  /// release (`3.x.x`) it will default to [collapseWhitespace]. This is in
-  /// order to avoid a dependency on specific versions of `dartfmt` and the
-  /// `analyzer` package.
-  ///
-  /// To future proof, see an example in code_builder's `test/common.dart`.
+  /// By default, uses [collapseWhitespace], but it is recommended to instead
+  /// use `dart_style` (dartfmt) where possible. See `test/common.dart` for an
+  /// example.
   static String Function(String) format = (String source) {
-    try {
-      return _formatter.format(source);
-    } on FormatException catch (_) {
-      return _formatter.formatStatement(source);
-    }
+    return collapseWhitespace(source);
   };
 
   static String _format(String source) {

lib/src/specs/expression.dart

@@ -9,7 +9,6 @@ import 'package:meta/meta.dart';
 import '../base.dart';
 import '../emitter.dart';
 import '../visitors.dart';
-import 'annotation.dart';
 import 'code.dart';
 import 'method.dart';
 import 'reference.dart';
@@ -244,44 +243,6 @@ abstract class Expression implements Spec {
     );
   }
 
-  /// Returns an annotation as a result of calling this constructor.
-  @Deprecated('Use "call" instead. Will be removed in 3.0.0.')
-  Expression annotation([
-    Iterable<Expression> positionalArguments,
-    Map<String, Expression> namedArguments = const {},
-    List<Reference> typeArguments = const [],
-  ]) {
-    if (positionalArguments == null) {
-      return new Annotation((b) {
-        b.code = code;
-      });
-    }
-    return new Annotation((b) {
-      b.code = new InvokeExpression._(
-        this,
-        positionalArguments.toList(),
-        namedArguments,
-        typeArguments,
-      )
-          .code;
-    });
-  }
-
-  /// Returns an annotation as a result of calling a named constructor.
-  @Deprecated('Use a combination of "property" and "call". Removing in 3.0.0.')
-  Expression annotationNamed(
-    String name,
-    Iterable<Expression> positionalArguments, [
-    Map<String, Expression> namedArguments = const {},
-    List<Reference> typeArguments = const [],
-  ]) {
-    // ignore: deprecated_member_use
-    return new Annotation((b) => b
-      ..code = new InvokeExpression._(this, positionalArguments.toList(),
-              namedArguments, typeArguments, name)
-          .code);
-  }
-
   /// This expression preceded by `return`.
   Expression get returned {
     return new BinaryExpression._(