Skip to content

Commit fdf4da2

Browse files
nateboschnatebosch
authored
Run dartfmt --fix to drop optional new (#373)
- Set minimum SDK to one that is Dart 2 by default. - Run dartfmt --fix - Test on stable on Travis.
1 parent db94d1e commit fdf4da2

28 files changed

+194
-185
lines changed

‎.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,30 @@ language: dart
44
jobs:
55
include:
66
- stage: analyze_format
7+
name: "SDK: dev - DIR: _test_annotations - TASKS: [dartfmt -n --set-exit-if-changed ., dartanalyzer --fatal-infos --fatal-warnings .]"
78
script: ./tool/travis.sh dartfmt dartanalyzer
89
env: PKG="_test_annotations"
910
dart: dev
1011
- stage: analyze_format
12+
name: "SDK: dev - DIR: source_gen - TASKS: [dartfmt -n --set-exit-if-changed ., dartanalyzer --fatal-infos --fatal-warnings .]"
1113
script: ./tool/travis.sh dartfmt dartanalyzer
1214
env: PKG="source_gen"
1315
dart: dev
16+
- stage: analyze_format
17+
name: "SDK: stable - DIR: source_gen - TASKS: [dartfmt -n --set-exit-if-changed ., dartanalyzer --fatal-infos --fatal-warnings .]"
18+
script: ./tool/travis.sh dartfmt dartanalyzer
19+
env: PKG="source_gen"
20+
dart: stable
1421
- stage: unit_test
22+
name: "SDK: dev - DIR: source_gen - TASKS: pub run test -j 1"
1523
script: ./tool/travis.sh test
1624
env: PKG="source_gen"
1725
dart: dev
26+
- stage: unit_test
27+
name: "SDK: stable - DIR: source_gen - TASKS: pub run test -j 1"
28+
script: ./tool/travis.sh test
29+
env: PKG="source_gen"
30+
dart: stable
1831

1932
stages:
2033
- analyze_format

‎analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ linter:
6767
- unnecessary_brace_in_string_interps
6868
- unnecessary_getters_setters
6969
- unnecessary_lambdas
70+
- unnecessary_new
7071
- unnecessary_null_aware_assignments
7172
- unnecessary_statements
7273
- unnecessary_this

‎source_gen/.mono_repo.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# See https://github.com/dart-lang/mono_repo for details
22
dart:
33
- dev
4+
- stable
45

56
stages:
67
- analyze_format:

‎source_gen/lib/builder.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ const _outputExtensions = '.g.dart';
2424
const _partFiles = '.g.part';
2525

2626
Builder combiningBuilder([BuilderOptions options]) {
27-
var optionsMap = new Map<String, dynamic>.from(options?.config ?? {});
27+
var optionsMap = Map<String, dynamic>.from(options?.config ?? {});
2828

29-
var builder = new CombiningBuilder(
29+
var builder = CombiningBuilder(
3030
includePartName: optionsMap.remove('include_part_name') as bool);
3131

3232
if (optionsMap.isNotEmpty) {
3333
if (log == null) {
34-
throw new StateError('Upgrade `build_runner` to at least 0.8.2.');
34+
throw StateError('Upgrade `build_runner` to at least 0.8.2.');
3535
} else {
3636
log.warning('These options were ignored: `$optionsMap`.');
3737
}
@@ -40,7 +40,7 @@ Builder combiningBuilder([BuilderOptions options]) {
4040
}
4141

4242
PostProcessBuilder partCleanup(BuilderOptions options) =>
43-
const FileDeletingBuilder(const ['.g.part']);
43+
const FileDeletingBuilder(['.g.part']);
4444

4545
/// A [Builder] which combines part files generated from [SharedPartBuilder].
4646
///
@@ -50,7 +50,7 @@ class CombiningBuilder implements Builder {
5050

5151
@override
5252
Map<String, List<String>> get buildExtensions => const {
53-
'.dart': const [_outputExtensions]
53+
'.dart': [_outputExtensions]
5454
};
5555

5656
/// Returns a new [CombiningBuilder].
@@ -71,7 +71,7 @@ class CombiningBuilder implements Builder {
7171

7272
// Pattern used to ensure items are only considered if they match
7373
// [file name without extension].[valid part id].[part file extension]
74-
var restrictedPattern = new RegExp([
74+
var restrictedPattern = RegExp([
7575
'^', // start of string
7676
RegExp.escape(inputBaseName), // file name, without extension
7777
'\.', // `.` character
@@ -81,12 +81,12 @@ class CombiningBuilder implements Builder {
8181
].join(''));
8282

8383
var assetIds = await buildStep
84-
.findAssets(new Glob(pattern))
84+
.findAssets(Glob(pattern))
8585
.where((id) => restrictedPattern.hasMatch(id.pathSegments.last))
8686
.toList()
8787
..sort();
8888

89-
var assets = await new Stream.fromIterable(assetIds)
89+
var assets = await Stream.fromIterable(assetIds)
9090
.asyncMap((id) async {
9191
var content = (await buildStep.readAsString(id)).trim();
9292
if (_includePartName) {

‎source_gen/lib/src/builder.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ class _Builder extends Builder {
4646
formatOutput = formatOutput ?? _formatter.format,
4747
_header = (header ?? defaultFileHeader).trim() {
4848
if (_generatedExtension == null) {
49-
throw new ArgumentError.notNull('generatedExtension');
49+
throw ArgumentError.notNull('generatedExtension');
5050
}
5151
if (_generatedExtension.isEmpty || !_generatedExtension.startsWith('.')) {
52-
throw new ArgumentError.value(_generatedExtension, 'generatedExtension',
52+
throw ArgumentError.value(_generatedExtension, 'generatedExtension',
5353
'Extension must be in the format of .*');
5454
}
5555
if (_isLibraryBuilder && _generators.length > 1) {
56-
throw new ArgumentError(
56+
throw ArgumentError(
5757
'A standalone file can only be generated from a single Generator.');
5858
}
5959
}
@@ -79,7 +79,7 @@ class _Builder extends Builder {
7979
if (generatedOutputs.isEmpty) return;
8080
final outputId = buildStep.inputId.changeExtension(_generatedExtension);
8181

82-
var contentBuffer = new StringBuffer();
82+
var contentBuffer = StringBuffer();
8383

8484
if (_header.isNotEmpty) {
8585
contentBuffer.writeln(_header);
@@ -90,7 +90,7 @@ class _Builder extends Builder {
9090
var name = nameOfPartial(library, asset);
9191
if (name == null) {
9292
var suggest = suggestLibraryName(asset);
93-
throw new InvalidGenerationSourceError(
93+
throw InvalidGenerationSourceError(
9494
'Could not find library identifier so a "part of" cannot be built.',
9595
todo: ''
9696
'Consider adding the following to your source file:\n\n'
@@ -175,7 +175,7 @@ class SharedPartBuilder extends _Builder {
175175
additionalOutputExtensions: additionalOutputExtensions,
176176
header: '') {
177177
if (!_partIdRegExp.hasMatch(partId)) {
178-
throw new ArgumentError.value(
178+
throw ArgumentError.value(
179179
partId,
180180
'partId',
181181
'`partId` can only contain letters, numbers, `_` and `.`. '
@@ -241,7 +241,7 @@ class LibraryBuilder extends _Builder {
241241

242242
Stream<GeneratedOutput> _generate(LibraryElement library,
243243
List<Generator> generators, BuildStep buildStep) async* {
244-
var libraryReader = new LibraryReader(library);
244+
var libraryReader = LibraryReader(library);
245245
for (var i = 0; i < generators.length; i++) {
246246
var gen = generators[i];
247247
try {
@@ -261,20 +261,20 @@ Stream<GeneratedOutput> _generate(LibraryElement library,
261261
continue;
262262
}
263263

264-
yield new GeneratedOutput(gen, createdUnit);
264+
yield GeneratedOutput(gen, createdUnit);
265265
} catch (e, stack) {
266266
log.severe('Error running $gen', e, stack);
267-
yield new GeneratedOutput.fromError(gen, e, stack);
267+
yield GeneratedOutput.fromError(gen, e, stack);
268268
}
269269
}
270270
}
271271

272-
final _formatter = new DartFormatter();
272+
final _formatter = DartFormatter();
273273

274274
const defaultFileHeader = '// GENERATED CODE - DO NOT MODIFY BY HAND';
275275

276276
final _headerLine = '// '.padRight(77, '*');
277277

278278
const partIdRegExpLiteral = r'[A-Za-z_\d-]+';
279279

280-
final _partIdRegExp = new RegExp('^$partIdRegExpLiteral\$');
280+
final _partIdRegExp = RegExp('^$partIdRegExpLiteral\$');

‎source_gen/lib/src/constants/reader.dart

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ import 'utils.dart';
1616
/// Unlike [DartObject.getField], the [read] method attempts to access super
1717
/// classes for the field value if not found.
1818
abstract class ConstantReader {
19-
factory ConstantReader(DartObject object) => isNullLike(object)
20-
? const _NullConstant()
21-
: new _DartObjectConstant(object);
19+
factory ConstantReader(DartObject object) =>
20+
isNullLike(object) ? const _NullConstant() : _DartObjectConstant(object);
2221

2322
const ConstantReader._();
2423

@@ -124,13 +123,13 @@ abstract class ConstantReader {
124123
class _NullConstant extends ConstantReader {
125124
@alwaysThrows
126125
static T _throw<T>(String expected) {
127-
throw new FormatException('Not an instance of $expected.');
126+
throw FormatException('Not an instance of $expected.');
128127
}
129128

130129
const _NullConstant() : super._();
131130

132131
@override
133-
DartObject get objectValue => throw new UnsupportedError('Null');
132+
DartObject get objectValue => throw UnsupportedError('Null');
134133

135134
@override
136135
bool get boolValue => _throw('bool');
@@ -151,7 +150,7 @@ class _NullConstant extends ConstantReader {
151150
ConstantReader peek(_) => null;
152151

153152
@override
154-
ConstantReader read(_) => throw new UnsupportedError('Null');
153+
ConstantReader read(_) => throw UnsupportedError('Null');
155154

156155
@override
157156
String get stringValue => _throw('String');
@@ -163,7 +162,7 @@ class _NullConstant extends ConstantReader {
163162
DartType get typeValue => _throw('Type');
164163

165164
@override
166-
Revivable revive() => throw new UnsupportedError('Null');
165+
Revivable revive() => throw UnsupportedError('Null');
167166
}
168167

169168
class _DartObjectConstant extends ConstantReader {
@@ -174,7 +173,7 @@ class _DartObjectConstant extends ConstantReader {
174173

175174
T _check<T>(T value, String expected) {
176175
if (value == null) {
177-
throw new FormatException('Not an instance of $expected.', objectValue);
176+
throw FormatException('Not an instance of $expected.', objectValue);
178177
}
179178
return value;
180179
}
@@ -187,7 +186,7 @@ class _DartObjectConstant extends ConstantReader {
187186
objectValue.toDoubleValue() ??
188187
objectValue.toListValue() ??
189188
objectValue.toMapValue() ??
190-
new Symbol(_check(objectValue.toSymbolValue(), 'literal'));
189+
Symbol(_check(objectValue.toSymbolValue(), 'literal'));
191190

192191
@override
193192
bool get isLiteral =>
@@ -249,7 +248,7 @@ class _DartObjectConstant extends ConstantReader {
249248

250249
@override
251250
Symbol get symbolValue =>
252-
new Symbol(_check(objectValue.toSymbolValue(), 'Symbol'));
251+
Symbol(_check(objectValue.toSymbolValue(), 'Symbol'));
253252

254253
@override
255254
bool get isType => objectValue.toTypeValue() != null;
@@ -259,7 +258,7 @@ class _DartObjectConstant extends ConstantReader {
259258

260259
@override
261260
ConstantReader peek(String field) {
262-
final constant = new ConstantReader(getFieldRecursive(objectValue, field));
261+
final constant = ConstantReader(getFieldRecursive(objectValue, field));
263262
return constant.isNull ? null : constant;
264263
}
265264

‎source_gen/lib/src/constants/revive.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Revivable reviveInstance(DartObject object, [LibraryElement origin]) {
2323
final element = object.type.element;
2424
var url = Uri.parse(urlOfElement(element));
2525
if (element is FunctionElement) {
26-
return new Revivable._(
26+
return Revivable._(
2727
source: url.removeFragment(),
2828
accessor: element.name,
2929
);
3030
}
3131
if (element is MethodElement && element.isStatic) {
32-
return new Revivable._(
32+
return Revivable._(
3333
source: url.removeFragment(),
3434
accessor: '${element.enclosingElement.name}.${element.name}',
3535
);
@@ -39,7 +39,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement origin]) {
3939
if (clazz.isEnum) {
4040
for (final e in clazz.fields.where(
4141
(f) => f.isPublic && f.isConst && f.computeConstantValue() == object)) {
42-
return new Revivable._(
42+
return Revivable._(
4343
source: url.removeFragment(),
4444
accessor: '${clazz.name}.${e.name}',
4545
);
@@ -49,7 +49,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement origin]) {
4949
.expand((t) => t.fields)
5050
.where((f) =>
5151
f.isPublic && f.isConst && f.computeConstantValue() == object)) {
52-
return new Revivable._(
52+
return Revivable._(
5353
source: url.removeFragment(),
5454
accessor: '${clazz.name}.${e.name}',
5555
);
@@ -59,7 +59,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement origin]) {
5959
i.constructor.isPublic &&
6060
i.constructor.enclosingElement.isPublic) {
6161
url = Uri.parse(urlOfElement(i.constructor.enclosingElement));
62-
return new Revivable._(
62+
return Revivable._(
6363
source: url,
6464
accessor: i.constructor.name,
6565
namedArguments: i.namedArguments,
@@ -72,7 +72,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement origin]) {
7272
for (final e in origin.definingCompilationUnit.topLevelVariables.where(
7373
(f) => f.isPublic && f.isConst && f.computeConstantValue() == object,
7474
)) {
75-
return new Revivable._(
75+
return Revivable._(
7676
source: Uri.parse(urlOfElement(origin)).replace(fragment: ''),
7777
accessor: e.name,
7878
);

‎source_gen/lib/src/constants/utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void assertHasField(ClassElement root, String name) {
1919
}
2020
final allFields = root.fields.toSet()
2121
..addAll(root.allSupertypes.expand((t) => t.element.fields));
22-
throw new FormatException(
22+
throw FormatException(
2323
'Class ${root.name} does not have field "$name".',
2424
'Fields: \n - ${allFields.map((e) => e.name).join('\n - ')}',
2525
);

‎source_gen/lib/src/generated_output.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class GeneratedOutput {
3636
}
3737

3838
String _outputFromError(Object error) {
39-
var buffer = new StringBuffer();
39+
var buffer = StringBuffer();
4040

4141
_commentWithHeader(_errorHeader, error.toString(), buffer);
4242

‎source_gen/lib/src/generator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class InvalidGenerationSourceError extends Error {
4848

4949
@override
5050
String toString() {
51-
var buffer = new StringBuffer(message);
51+
var buffer = StringBuffer(message);
5252

5353
if (element != null) {
5454
var span = spanForElement(element);

‎source_gen/lib/src/generator_for_annotation.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import 'type_checker.dart';
3737
abstract class GeneratorForAnnotation<T> extends Generator {
3838
const GeneratorForAnnotation();
3939

40-
TypeChecker get typeChecker => new TypeChecker.fromRuntime(T);
40+
TypeChecker get typeChecker => TypeChecker.fromRuntime(T);
4141

4242
@override
4343
FutureOr<String> generate(LibraryReader library, BuildStep buildStep) async {
44-
var values = new Set<String>();
44+
var values = Set<String>();
4545

4646
for (var annotatedElement in library.annotatedWith(typeChecker)) {
4747
var generatedValue = generateForAnnotatedElement(

0 commit comments

Comments
 (0)