Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit d28fd86

Browse files
nateboschmatanlurey
authored andcommitted
Run dartfmt --fix to drop optional new (#224)
- Update the SDK constraint to >=2.0.0 - Update README to drop `new` keyword. - Hold back lib/**/*.g.dart files since they are generated.
1 parent cfaa218 commit d28fd86

30 files changed

+304
-306
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import 'package:code_builder/code_builder.dart';
2020
import 'package:dart_style/dart_style.dart';
2121
2222
void main() {
23-
final animal = new Class((b) => b
23+
final animal = Class((b) => b
2424
..name = 'Animal'
2525
..extend = refer('Organism')
26-
..methods.add(new Method.returnsVoid((b) => b
26+
..methods.add(Method.returnsVoid((b) => b
2727
..name = 'eat'
2828
..body = const Code('print(\'Yum\')'))));
29-
final emitter = new DartEmitter();
30-
print(new DartFormatter().format('${animal.accept(emitter)}'));
29+
final emitter = DartEmitter();
30+
print(DartFormatter().format('${animal.accept(emitter)}'));
3131
}
3232
```
3333

@@ -47,18 +47,18 @@ import 'package:code_builder/code_builder.dart';
4747
import 'package:dart_style/dart_style.dart';
4848
4949
void main() {
50-
final library = new Library((b) => b.body.addAll([
51-
new Method((b) => b
50+
final library = Library((b) => b.body.addAll([
51+
Method((b) => b
5252
..body = const Code('')
5353
..name = 'doThing'
5454
..returns = refer('Thing', 'package:a/a.dart')),
55-
new Method((b) => b
55+
Method((b) => b
5656
..body = const Code('')
5757
..name = 'doOther'
5858
..returns = refer('Other', 'package:b/b.dart')),
5959
]));
60-
final emitter = new DartEmitter(new Allocator.simplePrefixing());
61-
print(new DartFormatter().format('${library.accept(emitter)}'));
60+
final emitter = DartEmitter(Allocator.simplePrefixing());
61+
print(DartFormatter().format('${library.accept(emitter)}'));
6262
}
6363
```
6464

example/example.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:code_builder/code_builder.dart';
66
import 'package:dart_style/dart_style.dart';
77

8-
final _dartfmt = new DartFormatter();
8+
final _dartfmt = DartFormatter();
99

1010
void main() {
1111
print('animalClass():\n${'=' * 40}\n${animalClass()}');
@@ -20,13 +20,13 @@ void main() {
2020
/// }
2121
/// ```
2222
String animalClass() {
23-
final animal = new Class((b) => b
23+
final animal = Class((b) => b
2424
..name = 'Animal'
2525
..extend = refer('Organism')
26-
..methods.add(new Method.returnsVoid((b) => b
26+
..methods.add(Method.returnsVoid((b) => b
2727
..name = 'eat'
2828
..body = refer('print').call([literalString('Yum!')]).code)));
29-
return _dartfmt.format('${animal.accept(new DartEmitter())}');
29+
return _dartfmt.format('${animal.accept(DartEmitter())}');
3030
}
3131

3232
/// Outputs:
@@ -40,15 +40,15 @@ String animalClass() {
4040
/// ```
4141
String scopedLibrary() {
4242
final methods = [
43-
new Method((b) => b
43+
Method((b) => b
4444
..body = const Code('')
4545
..name = 'doThing'
4646
..returns = refer('Thing', 'package:a/a.dart')),
47-
new Method((b) => b
47+
Method((b) => b
4848
..body = const Code('')
4949
..name = 'doOther'
5050
..returns = refer('Other', 'package:b/b.dart')),
5151
];
52-
final library = new Library((b) => b.body.addAll(methods));
53-
return _dartfmt.format('${library.accept(new DartEmitter.scoped())}');
52+
final library = Library((b) => b.body.addAll(methods));
53+
return _dartfmt.format('${library.accept(DartEmitter.scoped())}');
5454
}

lib/src/allocator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'specs/reference.dart';
1212
/// to resolve all symbols in your generated code.
1313
abstract class Allocator {
1414
/// An allocator that does not prefix symbols nor collects imports.
15-
static const Allocator none = const _NullAllocator();
15+
static const Allocator none = _NullAllocator();
1616

1717
/// Creates a new default allocator that applies no prefixing.
1818
factory Allocator() = _Allocator;
@@ -46,7 +46,7 @@ abstract class Allocator {
4646
}
4747

4848
class _Allocator implements Allocator {
49-
final _imports = new Set<String>();
49+
final _imports = Set<String>();
5050

5151
@override
5252
String allocate(Reference reference) {
@@ -58,7 +58,7 @@ class _Allocator implements Allocator {
5858

5959
@override
6060
Iterable<Directive> get imports {
61-
return _imports.map((u) => new Directive.import(u));
61+
return _imports.map((u) => Directive.import(u));
6262
}
6363
}
6464

@@ -73,7 +73,7 @@ class _NullAllocator implements Allocator {
7373
}
7474

7575
class _PrefixedAllocator implements Allocator {
76-
static const _doNotPrefix = const ['dart:core'];
76+
static const _doNotPrefix = ['dart:core'];
7777

7878
final _imports = <String, int>{};
7979
var _keys = 1;
@@ -92,7 +92,7 @@ class _PrefixedAllocator implements Allocator {
9292
@override
9393
Iterable<Directive> get imports {
9494
return _imports.keys.map(
95-
(u) => new Directive.import(u, as: '_i${_imports[u]}'),
95+
(u) => Directive.import(u, as: '_i${_imports[u]}'),
9696
);
9797
}
9898
}

lib/src/base.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class Spec {
99
}
1010

1111
/// Returns a generic [Spec] that is lazily generated when visited.
12-
Spec lazySpec(Spec Function() generate) => new _LazySpec(generate);
12+
Spec lazySpec(Spec Function() generate) => _LazySpec(generate);
1313

1414
class _LazySpec implements Spec {
1515
final Spec Function() generate;

lib/src/emitter.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class DartEmitter extends Object
5757

5858
/// Creates a new instance of [DartEmitter] with simple automatic imports.
5959
factory DartEmitter.scoped() {
60-
return new DartEmitter(new Allocator.simplePrefixing());
60+
return DartEmitter(Allocator.simplePrefixing());
6161
}
6262

6363
static bool _isLambdaBody(Code code) =>
@@ -74,15 +74,15 @@ class DartEmitter extends Object
7474

7575
@override
7676
visitAnnotation(Expression spec, [StringSink output]) {
77-
(output ??= new StringBuffer()).write('@');
77+
(output ??= StringBuffer()).write('@');
7878
spec.accept(this, output);
7979
output.write(' ');
8080
return output;
8181
}
8282

8383
@override
8484
visitClass(Class spec, [StringSink output]) {
85-
output ??= new StringBuffer();
85+
output ??= StringBuffer();
8686
spec.docs.forEach(output.writeln);
8787
spec.annotations.forEach((a) => visitAnnotation(a, output));
8888
if (spec.abstract) {
@@ -128,7 +128,7 @@ class DartEmitter extends Object
128128

129129
@override
130130
visitConstructor(Constructor spec, String clazz, [StringSink output]) {
131-
output ??= new StringBuffer();
131+
output ??= StringBuffer();
132132
spec.docs.forEach(output.writeln);
133133
spec.annotations.forEach((a) => visitAnnotation(a, output));
134134
if (spec.external) {
@@ -212,7 +212,7 @@ class DartEmitter extends Object
212212

213213
@override
214214
visitDirective(Directive spec, [StringSink output]) {
215-
output ??= new StringBuffer();
215+
output ??= StringBuffer();
216216
if (spec.type == DirectiveType.import) {
217217
output.write('import ');
218218
} else {
@@ -240,7 +240,7 @@ class DartEmitter extends Object
240240

241241
@override
242242
visitField(Field spec, [StringSink output]) {
243-
output ??= new StringBuffer();
243+
output ??= StringBuffer();
244244
spec.docs.forEach(output.writeln);
245245
spec.annotations.forEach((a) => visitAnnotation(a, output));
246246
if (spec.static) {
@@ -274,9 +274,9 @@ class DartEmitter extends Object
274274

275275
@override
276276
visitLibrary(Library spec, [StringSink output]) {
277-
output ??= new StringBuffer();
277+
output ??= StringBuffer();
278278
// Process the body first in order to prime the allocators.
279-
final body = new StringBuffer();
279+
final body = StringBuffer();
280280
for (final spec in spec.body) {
281281
spec.accept(this, body);
282282
if (spec is Method && _isLambdaMethod(spec)) {
@@ -296,7 +296,7 @@ class DartEmitter extends Object
296296

297297
@override
298298
visitFunctionType(FunctionType spec, [StringSink output]) {
299-
output ??= new StringBuffer();
299+
output ??= StringBuffer();
300300
if (spec.returnType != null) {
301301
spec.returnType.accept(this, output);
302302
output.write(' ');
@@ -336,7 +336,7 @@ class DartEmitter extends Object
336336

337337
@override
338338
visitMethod(Method spec, [StringSink output]) {
339-
output ??= new StringBuffer();
339+
output ??= StringBuffer();
340340
spec.docs.forEach(output.writeln);
341341
spec.annotations.forEach((a) => visitAnnotation(a, output));
342342
if (spec.external) {
@@ -452,15 +452,15 @@ class DartEmitter extends Object
452452

453453
@override
454454
visitReference(Reference spec, [StringSink output]) {
455-
return (output ??= new StringBuffer())..write(allocator.allocate(spec));
455+
return (output ??= StringBuffer())..write(allocator.allocate(spec));
456456
}
457457

458458
@override
459459
visitSpec(Spec spec, [StringSink output]) => spec.accept(this, output);
460460

461461
@override
462462
visitType(TypeReference spec, [StringSink output]) {
463-
output ??= new StringBuffer();
463+
output ??= StringBuffer();
464464
// Intentionally not .accept to avoid stack overflow.
465465
visitReference(spec, output);
466466
if (spec.bound != null) {
@@ -473,7 +473,7 @@ class DartEmitter extends Object
473473

474474
@override
475475
visitTypeParameters(Iterable<Reference> specs, [StringSink output]) {
476-
output ??= new StringBuffer();
476+
output ??= StringBuffer();
477477
if (specs.isNotEmpty) {
478478
output
479479
..write('<')

lib/src/matchers.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Matcher equalsDart(
1616
String source, [
1717
DartEmitter emitter,
1818
]) =>
19-
new EqualsDart._(EqualsDart._format(source), emitter ?? new DartEmitter());
19+
EqualsDart._(EqualsDart._format(source), emitter ?? DartEmitter());
2020

2121
/// Implementation detail of using the [equalsDart] matcher.
2222
///

lib/src/specs/class.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ abstract class ClassBuilder extends Object
7272
bool abstract = false;
7373

7474
@override
75-
ListBuilder<Expression> annotations = new ListBuilder<Expression>();
75+
ListBuilder<Expression> annotations = ListBuilder<Expression>();
7676

7777
@override
78-
ListBuilder<String> docs = new ListBuilder<String>();
78+
ListBuilder<String> docs = ListBuilder<String>();
7979

8080
Reference extend;
8181

82-
ListBuilder<Reference> implements = new ListBuilder<Reference>();
83-
ListBuilder<Reference> mixins = new ListBuilder<Reference>();
82+
ListBuilder<Reference> implements = ListBuilder<Reference>();
83+
ListBuilder<Reference> mixins = ListBuilder<Reference>();
8484

8585
@override
86-
ListBuilder<Reference> types = new ListBuilder<Reference>();
86+
ListBuilder<Reference> types = ListBuilder<Reference>();
8787

88-
ListBuilder<Constructor> constructors = new ListBuilder<Constructor>();
89-
ListBuilder<Method> methods = new ListBuilder<Method>();
90-
ListBuilder<Field> fields = new ListBuilder<Field>();
88+
ListBuilder<Constructor> constructors = ListBuilder<Constructor>();
89+
ListBuilder<Method> methods = ListBuilder<Method>();
90+
ListBuilder<Field> fields = ListBuilder<Field>();
9191

9292
/// Name of the class.
9393
String name;

lib/src/specs/code.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ abstract class Block implements Built<Block, BlockBuilder>, Code, Spec {
5050
factory Block([void updates(BlockBuilder b)]) = _$Block;
5151

5252
factory Block.of(Iterable<Code> statements) {
53-
return new Block((b) => b..statements.addAll(statements));
53+
return Block((b) => b..statements.addAll(statements));
5454
}
5555

5656
Block._();
@@ -75,7 +75,7 @@ abstract class BlockBuilder implements Builder<Block, BlockBuilder> {
7575
statements.add(expression.statement);
7676
}
7777

78-
ListBuilder<Code> statements = new ListBuilder<Code>();
78+
ListBuilder<Code> statements = ListBuilder<Code>();
7979
}
8080

8181
/// Knowledge of different types of blocks of code in Dart.
@@ -94,21 +94,21 @@ abstract class CodeEmitter implements CodeVisitor<StringSink> {
9494

9595
@override
9696
visitBlock(Block block, [StringSink output]) {
97-
output ??= new StringBuffer();
97+
output ??= StringBuffer();
9898
return visitAll<Code>(block.statements, output, (statement) {
9999
statement.accept(this, output);
100100
}, '\n');
101101
}
102102

103103
@override
104104
visitStaticCode(StaticCode code, [StringSink output]) {
105-
output ??= new StringBuffer();
105+
output ??= StringBuffer();
106106
return output..write(code.code);
107107
}
108108

109109
@override
110110
visitScopedCode(ScopedCode code, [StringSink output]) {
111-
output ??= new StringBuffer();
111+
output ??= StringBuffer();
112112
return output..write(code.code(allocator.allocate));
113113
}
114114
}
@@ -126,7 +126,7 @@ class LazyCode implements Code {
126126
}
127127

128128
/// Returns a generic [Code] that is lazily generated when visited.
129-
Code lazyCode(Code Function() generate) => new _LazyCode(generate);
129+
Code lazyCode(Code Function() generate) => _LazyCode(generate);
130130

131131
class _LazyCode implements Code {
132132
final Code Function() generate;

lib/src/specs/constructor.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ abstract class ConstructorBuilder extends Object
7272
ConstructorBuilder._();
7373

7474
@override
75-
ListBuilder<Expression> annotations = new ListBuilder<Expression>();
75+
ListBuilder<Expression> annotations = ListBuilder<Expression>();
7676

7777
@override
78-
ListBuilder<String> docs = new ListBuilder<String>();
78+
ListBuilder<String> docs = ListBuilder<String>();
7979

8080
/// Optional parameters.
81-
ListBuilder<Parameter> optionalParameters = new ListBuilder<Parameter>();
81+
ListBuilder<Parameter> optionalParameters = ListBuilder<Parameter>();
8282

8383
/// Required parameters.
84-
ListBuilder<Parameter> requiredParameters = new ListBuilder<Parameter>();
84+
ListBuilder<Parameter> requiredParameters = ListBuilder<Parameter>();
8585

8686
/// Constructor initializer statements.
87-
ListBuilder<Code> initializers = new ListBuilder<Code>();
87+
ListBuilder<Code> initializers = ListBuilder<Code>();
8888

8989
/// Body of the constructor.
9090
Code body;

lib/src/specs/directive.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class Directive implements Built<Directive, DirectiveBuilder>, Spec {
2020
List<String> show = const [],
2121
List<String> hide = const [],
2222
}) =>
23-
new Directive((builder) => builder
23+
Directive((builder) => builder
2424
..as = as
2525
..type = DirectiveType.import
2626
..url = url
@@ -33,7 +33,7 @@ abstract class Directive implements Built<Directive, DirectiveBuilder>, Spec {
3333
List<String> show = const [],
3434
List<String> hide = const [],
3535
}) =>
36-
new Directive((builder) => builder
36+
Directive((builder) => builder
3737
..as = as
3838
..type = DirectiveType.import
3939
..url = url
@@ -46,7 +46,7 @@ abstract class Directive implements Built<Directive, DirectiveBuilder>, Spec {
4646
List<String> show = const [],
4747
List<String> hide = const [],
4848
}) =>
49-
new Directive((builder) => builder
49+
Directive((builder) => builder
5050
..type = DirectiveType.export
5151
..url = url
5252
..show.addAll(show)

0 commit comments

Comments
 (0)