Skip to content

Commit a337a90

Browse files
authored
Run dartfmt --fix to drop new and some const (#1721)
Add the `unnecessary_new` lint to prevent new instances from showing up.
1 parent 55d62e3 commit a337a90

File tree

232 files changed

+2121
-2234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+2121
-2234
lines changed

_test/lib/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import 'dart:html';
66

77
void startApp({String text}) {
88
text ??= 'Hello World!';
9-
var component = new DivElement()..text = text;
9+
var component = DivElement()..text = text;
1010
document.body.append(component);
1111
}

_test/pkgs/provides_builder/lib/builders.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ class _SomeBuilder implements Builder {
1111

1212
factory _SomeBuilder.fromOptions(BuilderOptions options) {
1313
if (options.config['throw_in_constructor'] == true) {
14-
throw new StateError('Throwing on purpose cause you asked for it!');
14+
throw StateError('Throwing on purpose cause you asked for it!');
1515
}
1616
return const _SomeBuilder();
1717
}
1818

1919
@override
2020
final buildExtensions = const {
21-
'.dart': const ['.something.dart']
21+
'.dart': ['.something.dart']
2222
};
2323

2424
@override
@@ -61,8 +61,8 @@ class _ThrowingBuilder extends Builder {
6161
}
6262

6363
Builder someBuilder(BuilderOptions options) =>
64-
new _SomeBuilder.fromOptions(options);
64+
_SomeBuilder.fromOptions(options);
6565
Builder notApplied(_) => null;
6666
PostProcessBuilder somePostProcessBuilder(BuilderOptions options) =>
67-
new _SomePostProcessBuilder.fromOptions(options);
68-
Builder throwingBuilder(_) => new _ThrowingBuilder();
67+
_SomePostProcessBuilder.fromOptions(options);
68+
Builder throwingBuilder(_) => _ThrowingBuilder();

_test/test/build_integration_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void main() {
2121
test('creates expected outputs', () async {
2222
var generated =
2323
await readGeneratedFileAsString('_test/lib/hello.txt.post');
24-
var original = await new File('lib/hello.txt').readAsString();
24+
var original = await File('lib/hello.txt').readAsString();
2525
expect(generated, equals(original));
2626
});
2727

@@ -81,7 +81,7 @@ void main() {
8181
'Restores previously deleted outputs if they are not deleted in subsequent builds',
8282
() async {
8383
final dartSource =
84-
new File(p.join('build', 'web', 'packages', '_test', 'app.dart'));
84+
File(p.join('build', 'web', 'packages', '_test', 'app.dart'));
8585
await runBuild(trailingArgs: [
8686
'--define=build_web_compilers|dart_source_cleanup=enabled=true',
8787
'--output',

_test/test/build_script_invalidation_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void main() {
2323
var filePath = p.join('pkgs', 'provides_builder', 'lib', 'builders.dart');
2424
var terminateLine =
2525
nextStdOutLine('Terminating. No further builds will be scheduled');
26-
await replaceAllInFile(filePath, new RegExp(r'$'), '// do a build');
26+
await replaceAllInFile(filePath, RegExp(r'$'), '// do a build');
2727
await terminateLine;
2828
await stopServer();
2929
await startServer(extraExpects: [
@@ -38,18 +38,18 @@ void main() {
3838
var extraFilePath =
3939
p.join('.dart_tool', 'build', 'generated', 'foo', 'foo.txt');
4040
await createFile(extraFilePath, 'bar');
41-
expect(await new File(extraFilePath).exists(), isTrue);
41+
expect(await File(extraFilePath).exists(), isTrue);
4242

4343
var filePath = p.join('pkgs', 'provides_builder', 'lib', 'builders.dart');
4444
await stopServer();
45-
await replaceAllInFile(filePath, new RegExp(r'$'), '// do a build');
45+
await replaceAllInFile(filePath, RegExp(r'$'), '// do a build');
4646
await startServer(extraExpects: [
4747
() => nextStdOutLine(
4848
'Invalidating asset graph due to build script update'),
4949
() => nextStdOutLine('Building new asset graph'),
5050
]);
5151

52-
expect(await new File(extraFilePath).exists(), isFalse,
52+
expect(await File(extraFilePath).exists(), isFalse,
5353
reason: 'The cache dir should get deleted when the build '
5454
'script changes.');
5555
});
@@ -65,15 +65,15 @@ void main() {
6565
var extraFilePath =
6666
p.join('.dart_tool', 'build', 'generated', 'foo', 'foo.txt');
6767
await createFile(extraFilePath, 'bar');
68-
expect(await new File(extraFilePath).exists(), isTrue);
68+
expect(await File(extraFilePath).exists(), isTrue);
6969

7070
await startServer(extraExpects: [
7171
() => nextStdOutLine(
7272
'Throwing away cached asset graph due to version mismatch.'),
7373
() => nextStdOutLine('Building new asset graph'),
7474
]);
7575

76-
expect(await new File(extraFilePath).exists(), isFalse,
76+
expect(await File(extraFilePath).exists(), isFalse,
7777
reason: 'The cache dir should get deleted when the asset graph '
7878
'can\'t be parsed');
7979
}, onPlatform: {'windows': const Skip('flaky on windows')});

_test/test/common/utils.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import 'dart:io';
99
import 'package:path/path.dart' as p;
1010
import 'package:test/test.dart';
1111

12-
Directory _generatedDir = new Directory(p.join(_toolDir.path, 'generated'));
13-
Directory _toolDir = new Directory(p.join('.dart_tool', 'build'));
12+
Directory _generatedDir = Directory(p.join(_toolDir.path, 'generated'));
13+
Directory _toolDir = Directory(p.join('.dart_tool', 'build'));
1414

1515
Process _process;
1616
Stream<String> _stdOutLines;
@@ -195,26 +195,26 @@ Future<Null> expectTestsPass(
195195
}
196196

197197
Future<Null> createFile(String path, String contents) async {
198-
var file = new File(path);
198+
var file = File(path);
199199
expect(await file.exists(), isFalse);
200200
await file.create(recursive: true);
201201
await file.writeAsString(contents);
202202
}
203203

204204
Future<Null> deleteFile(String path) async {
205-
var file = new File(path);
205+
var file = File(path);
206206
expect(await file.exists(), isTrue);
207207
await file.delete();
208208
}
209209

210210
Future<String> readGeneratedFileAsString(String path) async {
211-
var file = new File(p.join(_generatedDir.path, path));
211+
var file = File(p.join(_generatedDir.path, path));
212212
expect(await file.exists(), isTrue);
213213
return file.readAsString();
214214
}
215215

216216
Future<Null> replaceAllInFile(String path, Pattern from, String replace) async {
217-
var file = new File(path);
217+
var file = File(path);
218218
expect(await file.exists(), isTrue);
219219
var content = await file.readAsString();
220220
await file.writeAsString(content.replaceAll(from, replace));

_test/test/dart2js_integration_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const _outputDir = 'dart2js_test';
1616
void main() {
1717
group('Can run tests using dart2js', () {
1818
tearDown(() async {
19-
var dir = new Directory(_outputDir);
19+
var dir = Directory(_outputDir);
2020
if (await dir.exists()) {
2121
await dir.delete(recursive: true);
2222
}
@@ -65,7 +65,7 @@ void main() {
6565
}
6666

6767
Future<Null> expectWasCompiledWithDart2Js({bool minified = false}) async {
68-
var jsFile = new File('$_outputDir/test/hello_world_deferred_test.dart.js');
68+
var jsFile = File('$_outputDir/test/hello_world_deferred_test.dart.js');
6969
expect(await jsFile.exists(), isTrue);
7070
// sanity check that it was indeed compiled with dart2js
7171
var content = await jsFile.readAsString();
@@ -77,6 +77,6 @@ Future<Null> expectWasCompiledWithDart2Js({bool minified = false}) async {
7777
}
7878

7979
var jsDeferredPartFile =
80-
new File('$_outputDir/test/hello_world_deferred_test.dart.js_1.part.js');
80+
File('$_outputDir/test/hello_world_deferred_test.dart.js_1.part.js');
8181
expect(await jsDeferredPartFile.exists(), isTrue);
8282
}

_test/test/generated_script_integration_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ void main() {
1616

1717
test('Generates a build script matching the golden', () {
1818
var generatedScript =
19-
new File('.dart_tool/build/entrypoint/build.dart').readAsStringSync();
20-
var expected = new File('test/goldens/generated_build_script.dart')
19+
File('.dart_tool/build/entrypoint/build.dart').readAsStringSync();
20+
var expected = File('test/goldens/generated_build_script.dart')
2121
.readAsStringSync()
2222
.replaceAll('\r', '');
2323
expect(generatedScript, expected);

_test/test/serve_integration_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
// These tests depend on running `test` while a `serve` is ongoing.
1818
await startServer(
1919
ensureCleanBuild: true, buildArgs: ['--skip-build-script-check']);
20-
httpClient = new HttpClient();
20+
httpClient = HttpClient();
2121
});
2222

2323
tearDownAll(() async {

_test/test/test_integration_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void main() {
2020
testArgs: ['--run-skipped', 'test/hello_world_test.dart']);
2121
printOnFailure(result.stderr.toString());
2222
expect(result.exitCode, isNot(ExitCode.success));
23-
expect(result.stdout,
24-
matches(new RegExp(r'hello_world_test.dart [\d]+:[\d]+')));
23+
expect(
24+
result.stdout, matches(RegExp(r'hello_world_test.dart [\d]+:[\d]+')));
2525
expect(result.stdout, isNot(contains('.js')));
2626
});
2727

_test/tool/build_kernel_ddc.dart

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import 'package:build_test/builder.dart';
1313

1414
Future main(List<String> args) async {
1515
var builders = [
16-
apply('_test|test_bootstrap', [(_) => new TestBootstrapBuilder()], toRoot(),
17-
defaultGenerateFor:
18-
const InputSet(include: const ['test/**_test.dart']),
16+
apply('_test|test_bootstrap', [(_) => TestBootstrapBuilder()], toRoot(),
17+
defaultGenerateFor: const InputSet(include: ['test/**_test.dart']),
1918
hideOutput: true),
2019
apply(
2120
'_test|ddc_kernel',
@@ -31,18 +30,16 @@ Future main(List<String> args) async {
3130
apply(
3231
'build_web_compilers|ddc',
3332
[
34-
(_) => new DevCompilerBuilder(useKernel: true),
33+
(_) => DevCompilerBuilder(useKernel: true),
3534
],
3635
toAllPackages(),
3736
isOptional: true,
3837
hideOutput: true),
3938
apply(
4039
'build_web_compilers|entrypoint',
41-
[
42-
(_) => new WebEntrypointBuilder(WebCompiler.DartDevc, useKernel: true)
43-
],
40+
[(_) => WebEntrypointBuilder(WebCompiler.DartDevc, useKernel: true)],
4441
toRoot(),
45-
defaultGenerateFor: const InputSet(include: const [
42+
defaultGenerateFor: const InputSet(include: [
4643
'web/**.dart',
4744
'test/**.browser_test.dart',
4845
]),

_test_common/lib/assets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:crypto/crypto.dart';
99
AssetNode makeAssetNode(
1010
[String assetIdString, List<AssetId> outputs, Digest lastKnownDigest]) {
1111
var id = makeAssetId(assetIdString);
12-
var node = new SourceAssetNode(id, lastKnownDigest: lastKnownDigest);
12+
var node = SourceAssetNode(id, lastKnownDigest: lastKnownDigest);
1313
if (outputs != null) {
1414
node.outputs.addAll(outputs);
1515
node.primaryOutputs.addAll(outputs);

_test_common/lib/build_configs.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ import 'package:build_config/build_config.dart';
66

77
Map<String, BuildConfig> parseBuildConfigs(
88
Map<String, Map<String, dynamic>> configs) =>
9-
new Map<String, BuildConfig>.fromIterable(configs.keys,
10-
value: (key) =>
11-
new BuildConfig.fromMap(key as String, [], configs[key]));
9+
Map<String, BuildConfig>.fromIterable(configs.keys,
10+
value: (key) => BuildConfig.fromMap(key as String, [], configs[key]));

_test_common/lib/common.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ AssetId _outputId(
5050
var newPath =
5151
inputId.path.substring(0, inputId.path.length - inputExtension.length) +
5252
outputExtension;
53-
return new AssetId(inputId.package, newPath);
53+
return AssetId(inputId.package, newPath);
5454
}

_test_common/lib/descriptors.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Future<d.FileDescriptor> pubspec(String name,
2626
pathDependencies ??= {};
2727
versionDependencies ??= {};
2828

29-
var buffer = new StringBuffer()
29+
var buffer = StringBuffer()
3030
..writeln('name: $name')
3131
// Using dependency_overrides forces the path dependency and silences
3232
// warnings about hosted vs path dependency conflicts.

_test_common/lib/in_memory_writer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class InMemoryRunnerAssetWriter extends InMemoryAssetWriter
2222
var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
2323
await super.writeAsBytes(id, bytes);
2424
FakeWatcher.notifyWatchers(
25-
new WatchEvent(type, p.absolute(id.package, id.path)));
25+
WatchEvent(type, p.absolute(id.package, id.path)));
2626
}
2727

2828
@override
@@ -31,14 +31,14 @@ class InMemoryRunnerAssetWriter extends InMemoryAssetWriter
3131
var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
3232
await super.writeAsString(id, contents, encoding: encoding);
3333
FakeWatcher.notifyWatchers(
34-
new WatchEvent(type, p.absolute(id.package, id.path)));
34+
WatchEvent(type, p.absolute(id.package, id.path)));
3535
}
3636

3737
@override
3838
Future delete(AssetId id) async {
3939
if (onDelete != null) onDelete(id);
4040
assets.remove(id);
4141
FakeWatcher.notifyWatchers(
42-
new WatchEvent(ChangeType.REMOVE, p.absolute(id.package, id.path)));
42+
WatchEvent(ChangeType.REMOVE, p.absolute(id.package, id.path)));
4343
}
4444
}

_test_common/lib/matchers.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import 'package:build_runner_core/src/asset_graph/graph.dart';
88
import 'package:build_runner_core/src/asset_graph/node.dart';
99

1010
final Matcher assetGraphVersionException =
11-
new TypeMatcher<AssetGraphVersionException>();
11+
TypeMatcher<AssetGraphVersionException>();
1212
final Matcher duplicateAssetNodeException =
13-
new TypeMatcher<DuplicateAssetNodeException>();
13+
TypeMatcher<DuplicateAssetNodeException>();
1414

1515
Matcher equalsAssetGraph(AssetGraph expected,
1616
{bool checkPreviousInputsDigest}) =>
17-
new _AssetGraphMatcher(expected, checkPreviousInputsDigest ?? true);
17+
_AssetGraphMatcher(expected, checkPreviousInputsDigest ?? true);
1818

1919
class _AssetGraphMatcher extends Matcher {
2020
final AssetGraph _expected;

_test_common/lib/package_graphs.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
import 'package:build_runner_core/build_runner_core.dart';
66

77
PackageGraph buildPackageGraph(Map<PackageNode, Iterable<String>> packages) {
8-
var packagesByName = new Map<String, PackageNode>.fromIterable(packages.keys,
8+
var packagesByName = Map<String, PackageNode>.fromIterable(packages.keys,
99
key: (p) => (p as PackageNode).name);
1010
for (final package in packages.keys) {
1111
package.dependencies
1212
.addAll(packages[package].map((name) => packagesByName[name]));
1313
}
1414
var root = packages.keys.singleWhere((n) => n.isRoot);
15-
return new PackageGraph.fromRoot(root);
15+
return PackageGraph.fromRoot(root);
1616
}
1717

1818
PackageNode package(String packageName, {String path, DependencyType type}) =>
19-
new PackageNode(packageName, path, type);
19+
PackageNode(packageName, path, type);
2020

2121
PackageNode rootPackage(String packageName, {String path}) =>
22-
new PackageNode(packageName, path, DependencyType.path, isRoot: true);
22+
PackageNode(packageName, path, DependencyType.path, isRoot: true);

_test_common/lib/runner_asset_writer_spy.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:build/build.dart';
1010
class RunnerAssetWriterSpy extends AssetWriterSpy implements RunnerAssetWriter {
1111
final RunnerAssetWriter _delegate;
1212

13-
final _assetsDeleted = new Set<AssetId>();
13+
final _assetsDeleted = Set<AssetId>();
1414
Iterable<AssetId> get assetsDeleted => _assetsDeleted;
1515

1616
RunnerAssetWriterSpy(this._delegate) : super(_delegate);

_test_common/lib/test_environment.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class TestBuildEnvironment extends BuildEnvironment {
4545
{RunnerAssetReader reader,
4646
RunnerAssetWriter writer,
4747
this.throwOnPrompt = false})
48-
: this.reader = reader ?? new InMemoryRunnerAssetReader(),
49-
this.writer = writer ?? new InMemoryRunnerAssetWriter();
48+
: this.reader = reader ?? InMemoryRunnerAssetReader(),
49+
this.writer = writer ?? InMemoryRunnerAssetWriter();
5050

5151
@override
5252
void onLog(LogRecord record) => logRecords.add(record);
@@ -60,9 +60,9 @@ class TestBuildEnvironment extends BuildEnvironment {
6060
/// this method should throw [NonInteractiveBuildException].
6161
@override
6262
Future<int> prompt(String message, List<String> choices) {
63-
if (throwOnPrompt) throw new NonInteractiveBuildException();
63+
if (throwOnPrompt) throw NonInteractiveBuildException();
6464

6565
assert(_nextPromptResponse != null);
66-
return new Future.value(_nextPromptResponse);
66+
return Future.value(_nextPromptResponse);
6767
}
6868
}

0 commit comments

Comments
 (0)