Skip to content

Run dartfmt --fix to drop new and some const #1721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _test/lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import 'dart:html';

void startApp({String text}) {
text ??= 'Hello World!';
var component = new DivElement()..text = text;
var component = DivElement()..text = text;
document.body.append(component);
}
10 changes: 5 additions & 5 deletions _test/pkgs/provides_builder/lib/builders.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ class _SomeBuilder implements Builder {

factory _SomeBuilder.fromOptions(BuilderOptions options) {
if (options.config['throw_in_constructor'] == true) {
throw new StateError('Throwing on purpose cause you asked for it!');
throw StateError('Throwing on purpose cause you asked for it!');
}
return const _SomeBuilder();
}

@override
final buildExtensions = const {
'.dart': const ['.something.dart']
'.dart': ['.something.dart']
};

@override
Expand Down Expand Up @@ -61,8 +61,8 @@ class _ThrowingBuilder extends Builder {
}

Builder someBuilder(BuilderOptions options) =>
new _SomeBuilder.fromOptions(options);
_SomeBuilder.fromOptions(options);
Builder notApplied(_) => null;
PostProcessBuilder somePostProcessBuilder(BuilderOptions options) =>
new _SomePostProcessBuilder.fromOptions(options);
Builder throwingBuilder(_) => new _ThrowingBuilder();
_SomePostProcessBuilder.fromOptions(options);
Builder throwingBuilder(_) => _ThrowingBuilder();
4 changes: 2 additions & 2 deletions _test/test/build_integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void main() {
test('creates expected outputs', () async {
var generated =
await readGeneratedFileAsString('_test/lib/hello.txt.post');
var original = await new File('lib/hello.txt').readAsString();
var original = await File('lib/hello.txt').readAsString();
expect(generated, equals(original));
});

Expand Down Expand Up @@ -81,7 +81,7 @@ void main() {
'Restores previously deleted outputs if they are not deleted in subsequent builds',
() async {
final dartSource =
new File(p.join('build', 'web', 'packages', '_test', 'app.dart'));
File(p.join('build', 'web', 'packages', '_test', 'app.dart'));
await runBuild(trailingArgs: [
'--define=build_web_compilers|dart_source_cleanup=enabled=true',
'--output',
Expand Down
12 changes: 6 additions & 6 deletions _test/test/build_script_invalidation_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void main() {
var filePath = p.join('pkgs', 'provides_builder', 'lib', 'builders.dart');
var terminateLine =
nextStdOutLine('Terminating. No further builds will be scheduled');
await replaceAllInFile(filePath, new RegExp(r'$'), '// do a build');
await replaceAllInFile(filePath, RegExp(r'$'), '// do a build');
await terminateLine;
await stopServer();
await startServer(extraExpects: [
Expand All @@ -38,18 +38,18 @@ void main() {
var extraFilePath =
p.join('.dart_tool', 'build', 'generated', 'foo', 'foo.txt');
await createFile(extraFilePath, 'bar');
expect(await new File(extraFilePath).exists(), isTrue);
expect(await File(extraFilePath).exists(), isTrue);

var filePath = p.join('pkgs', 'provides_builder', 'lib', 'builders.dart');
await stopServer();
await replaceAllInFile(filePath, new RegExp(r'$'), '// do a build');
await replaceAllInFile(filePath, RegExp(r'$'), '// do a build');
await startServer(extraExpects: [
() => nextStdOutLine(
'Invalidating asset graph due to build script update'),
() => nextStdOutLine('Building new asset graph'),
]);

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

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

expect(await new File(extraFilePath).exists(), isFalse,
expect(await File(extraFilePath).exists(), isFalse,
reason: 'The cache dir should get deleted when the asset graph '
'can\'t be parsed');
}, onPlatform: {'windows': const Skip('flaky on windows')});
Expand Down
12 changes: 6 additions & 6 deletions _test/test/common/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import 'dart:io';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';

Directory _generatedDir = new Directory(p.join(_toolDir.path, 'generated'));
Directory _toolDir = new Directory(p.join('.dart_tool', 'build'));
Directory _generatedDir = Directory(p.join(_toolDir.path, 'generated'));
Directory _toolDir = Directory(p.join('.dart_tool', 'build'));

Process _process;
Stream<String> _stdOutLines;
Expand Down Expand Up @@ -195,26 +195,26 @@ Future<Null> expectTestsPass(
}

Future<Null> createFile(String path, String contents) async {
var file = new File(path);
var file = File(path);
expect(await file.exists(), isFalse);
await file.create(recursive: true);
await file.writeAsString(contents);
}

Future<Null> deleteFile(String path) async {
var file = new File(path);
var file = File(path);
expect(await file.exists(), isTrue);
await file.delete();
}

Future<String> readGeneratedFileAsString(String path) async {
var file = new File(p.join(_generatedDir.path, path));
var file = File(p.join(_generatedDir.path, path));
expect(await file.exists(), isTrue);
return file.readAsString();
}

Future<Null> replaceAllInFile(String path, Pattern from, String replace) async {
var file = new File(path);
var file = File(path);
expect(await file.exists(), isTrue);
var content = await file.readAsString();
await file.writeAsString(content.replaceAll(from, replace));
Expand Down
6 changes: 3 additions & 3 deletions _test/test/dart2js_integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const _outputDir = 'dart2js_test';
void main() {
group('Can run tests using dart2js', () {
tearDown(() async {
var dir = new Directory(_outputDir);
var dir = Directory(_outputDir);
if (await dir.exists()) {
await dir.delete(recursive: true);
}
Expand Down Expand Up @@ -65,7 +65,7 @@ void main() {
}

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

var jsDeferredPartFile =
new File('$_outputDir/test/hello_world_deferred_test.dart.js_1.part.js');
File('$_outputDir/test/hello_world_deferred_test.dart.js_1.part.js');
expect(await jsDeferredPartFile.exists(), isTrue);
}
4 changes: 2 additions & 2 deletions _test/test/generated_script_integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ void main() {

test('Generates a build script matching the golden', () {
var generatedScript =
new File('.dart_tool/build/entrypoint/build.dart').readAsStringSync();
var expected = new File('test/goldens/generated_build_script.dart')
File('.dart_tool/build/entrypoint/build.dart').readAsStringSync();
var expected = File('test/goldens/generated_build_script.dart')
.readAsStringSync()
.replaceAll('\r', '');
expect(generatedScript, expected);
Expand Down
2 changes: 1 addition & 1 deletion _test/test/serve_integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {
// These tests depend on running `test` while a `serve` is ongoing.
await startServer(
ensureCleanBuild: true, buildArgs: ['--skip-build-script-check']);
httpClient = new HttpClient();
httpClient = HttpClient();
});

tearDownAll(() async {
Expand Down
4 changes: 2 additions & 2 deletions _test/test/test_integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ void main() {
testArgs: ['--run-skipped', 'test/hello_world_test.dart']);
printOnFailure(result.stderr.toString());
expect(result.exitCode, isNot(ExitCode.success));
expect(result.stdout,
matches(new RegExp(r'hello_world_test.dart [\d]+:[\d]+')));
expect(
result.stdout, matches(RegExp(r'hello_world_test.dart [\d]+:[\d]+')));
expect(result.stdout, isNot(contains('.js')));
});

Expand Down
13 changes: 5 additions & 8 deletions _test/tool/build_kernel_ddc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ import 'package:build_test/builder.dart';

Future main(List<String> args) async {
var builders = [
apply('_test|test_bootstrap', [(_) => new TestBootstrapBuilder()], toRoot(),
defaultGenerateFor:
const InputSet(include: const ['test/**_test.dart']),
apply('_test|test_bootstrap', [(_) => TestBootstrapBuilder()], toRoot(),
defaultGenerateFor: const InputSet(include: ['test/**_test.dart']),
hideOutput: true),
apply(
'_test|ddc_kernel',
Expand All @@ -31,18 +30,16 @@ Future main(List<String> args) async {
apply(
'build_web_compilers|ddc',
[
(_) => new DevCompilerBuilder(useKernel: true),
(_) => DevCompilerBuilder(useKernel: true),
],
toAllPackages(),
isOptional: true,
hideOutput: true),
apply(
'build_web_compilers|entrypoint',
[
(_) => new WebEntrypointBuilder(WebCompiler.DartDevc, useKernel: true)
],
[(_) => WebEntrypointBuilder(WebCompiler.DartDevc, useKernel: true)],
toRoot(),
defaultGenerateFor: const InputSet(include: const [
defaultGenerateFor: const InputSet(include: [
'web/**.dart',
'test/**.browser_test.dart',
]),
Expand Down
2 changes: 1 addition & 1 deletion _test_common/lib/assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:crypto/crypto.dart';
AssetNode makeAssetNode(
[String assetIdString, List<AssetId> outputs, Digest lastKnownDigest]) {
var id = makeAssetId(assetIdString);
var node = new SourceAssetNode(id, lastKnownDigest: lastKnownDigest);
var node = SourceAssetNode(id, lastKnownDigest: lastKnownDigest);
if (outputs != null) {
node.outputs.addAll(outputs);
node.primaryOutputs.addAll(outputs);
Expand Down
5 changes: 2 additions & 3 deletions _test_common/lib/build_configs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ import 'package:build_config/build_config.dart';

Map<String, BuildConfig> parseBuildConfigs(
Map<String, Map<String, dynamic>> configs) =>
new Map<String, BuildConfig>.fromIterable(configs.keys,
value: (key) =>
new BuildConfig.fromMap(key as String, [], configs[key]));
Map<String, BuildConfig>.fromIterable(configs.keys,
value: (key) => BuildConfig.fromMap(key as String, [], configs[key]));
2 changes: 1 addition & 1 deletion _test_common/lib/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ AssetId _outputId(
var newPath =
inputId.path.substring(0, inputId.path.length - inputExtension.length) +
outputExtension;
return new AssetId(inputId.package, newPath);
return AssetId(inputId.package, newPath);
}
2 changes: 1 addition & 1 deletion _test_common/lib/descriptors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Future<d.FileDescriptor> pubspec(String name,
pathDependencies ??= {};
versionDependencies ??= {};

var buffer = new StringBuffer()
var buffer = StringBuffer()
..writeln('name: $name')
// Using dependency_overrides forces the path dependency and silences
// warnings about hosted vs path dependency conflicts.
Expand Down
6 changes: 3 additions & 3 deletions _test_common/lib/in_memory_writer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class InMemoryRunnerAssetWriter extends InMemoryAssetWriter
var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
await super.writeAsBytes(id, bytes);
FakeWatcher.notifyWatchers(
new WatchEvent(type, p.absolute(id.package, id.path)));
WatchEvent(type, p.absolute(id.package, id.path)));
}

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

@override
Future delete(AssetId id) async {
if (onDelete != null) onDelete(id);
assets.remove(id);
FakeWatcher.notifyWatchers(
new WatchEvent(ChangeType.REMOVE, p.absolute(id.package, id.path)));
WatchEvent(ChangeType.REMOVE, p.absolute(id.package, id.path)));
}
}
6 changes: 3 additions & 3 deletions _test_common/lib/matchers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import 'package:build_runner_core/src/asset_graph/graph.dart';
import 'package:build_runner_core/src/asset_graph/node.dart';

final Matcher assetGraphVersionException =
new TypeMatcher<AssetGraphVersionException>();
TypeMatcher<AssetGraphVersionException>();
final Matcher duplicateAssetNodeException =
new TypeMatcher<DuplicateAssetNodeException>();
TypeMatcher<DuplicateAssetNodeException>();

Matcher equalsAssetGraph(AssetGraph expected,
{bool checkPreviousInputsDigest}) =>
new _AssetGraphMatcher(expected, checkPreviousInputsDigest ?? true);
_AssetGraphMatcher(expected, checkPreviousInputsDigest ?? true);

class _AssetGraphMatcher extends Matcher {
final AssetGraph _expected;
Expand Down
8 changes: 4 additions & 4 deletions _test_common/lib/package_graphs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
import 'package:build_runner_core/build_runner_core.dart';

PackageGraph buildPackageGraph(Map<PackageNode, Iterable<String>> packages) {
var packagesByName = new Map<String, PackageNode>.fromIterable(packages.keys,
var packagesByName = Map<String, PackageNode>.fromIterable(packages.keys,
key: (p) => (p as PackageNode).name);
for (final package in packages.keys) {
package.dependencies
.addAll(packages[package].map((name) => packagesByName[name]));
}
var root = packages.keys.singleWhere((n) => n.isRoot);
return new PackageGraph.fromRoot(root);
return PackageGraph.fromRoot(root);
}

PackageNode package(String packageName, {String path, DependencyType type}) =>
new PackageNode(packageName, path, type);
PackageNode(packageName, path, type);

PackageNode rootPackage(String packageName, {String path}) =>
new PackageNode(packageName, path, DependencyType.path, isRoot: true);
PackageNode(packageName, path, DependencyType.path, isRoot: true);
2 changes: 1 addition & 1 deletion _test_common/lib/runner_asset_writer_spy.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:build/build.dart';
class RunnerAssetWriterSpy extends AssetWriterSpy implements RunnerAssetWriter {
final RunnerAssetWriter _delegate;

final _assetsDeleted = new Set<AssetId>();
final _assetsDeleted = Set<AssetId>();
Iterable<AssetId> get assetsDeleted => _assetsDeleted;

RunnerAssetWriterSpy(this._delegate) : super(_delegate);
Expand Down
8 changes: 4 additions & 4 deletions _test_common/lib/test_environment.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class TestBuildEnvironment extends BuildEnvironment {
{RunnerAssetReader reader,
RunnerAssetWriter writer,
this.throwOnPrompt = false})
: this.reader = reader ?? new InMemoryRunnerAssetReader(),
this.writer = writer ?? new InMemoryRunnerAssetWriter();
: this.reader = reader ?? InMemoryRunnerAssetReader(),
this.writer = writer ?? InMemoryRunnerAssetWriter();

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

assert(_nextPromptResponse != null);
return new Future.value(_nextPromptResponse);
return Future.value(_nextPromptResponse);
}
}
Loading