Skip to content

Commit 4097eeb

Browse files
committed
[hooks_runner] Use dot shorthands
1 parent 77d80f4 commit 4097eeb

31 files changed

+93
-99
lines changed

pkgs/hooks_runner/analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ linter:
1111
- prefer_expression_function_bodies
1212
- prefer_final_in_for_each
1313
- prefer_final_locals
14+
15+
formatter:
16+
trailing_commas: preserve

pkgs/hooks_runner/lib/src/build_runner/build_planner.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class NativeAssetsBuildPlanner {
7676
'BuildPlanner.packagesWithHook',
7777
arguments: {'hook': hook.toString()},
7878
() async => switch (hook) {
79-
Hook.build => _packagesWithBuildHook ??= await _runPackagesWithHook(hook),
80-
Hook.link => _packagesWithLinkHook ??= await _runPackagesWithHook(hook),
79+
.build => _packagesWithBuildHook ??= await _runPackagesWithHook(hook),
80+
.link => _packagesWithLinkHook ??= await _runPackagesWithHook(hook),
8181
},
8282
);
8383

@@ -332,7 +332,8 @@ class PackageGraph {
332332
/// compilation. This enum holds static information about these hooks.
333333
enum Hook {
334334
link('link'),
335-
build('build');
335+
build('build')
336+
;
336337

337338
final String _scriptName;
338339

pkgs/hooks_runner/lib/src/build_runner/build_runner.dart

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class NativeAssetsBuildRunner {
136136
required List<ProtocolExtension> extensions,
137137
required bool linkingEnabled,
138138
}) async => _timeAsync('BuildRunner.build', () async {
139-
final planResult = await _makePlan(hook: Hook.build, buildResult: null);
139+
final planResult = await _makePlan(hook: .build, buildResult: null);
140140
if (planResult.isFailure) {
141141
return planResult.asFailure;
142142
}
@@ -252,10 +252,7 @@ class NativeAssetsBuildRunner {
252252
Uri? resourceIdentifiers,
253253
required BuildResult buildResult,
254254
}) async => _timeAsync('BuildRunner.link', () async {
255-
final planResult = await _makePlan(
256-
hook: Hook.link,
257-
buildResult: buildResult,
258-
);
255+
final planResult = await _makePlan(hook: .link, buildResult: buildResult);
259256
if (planResult.isFailure) return planResult.asFailure;
260257
final (buildPlan, packageGraph) = planResult.success;
261258
if (buildPlan.isEmpty) {
@@ -930,7 +927,7 @@ ${compileResult.stdout}
930927
if (input is BuildInput) {
931928
final planner = await _planner;
932929
final packagesWithLink = (await planner.packagesWithHook(
933-
Hook.link,
930+
.link,
934931
)).map((p) => p.name);
935932
for (final targetPackage
936933
in (output as BuildOutput).assets.encodedAssetsForLinking.keys) {
@@ -966,14 +963,14 @@ ${compileResult.stdout}
966963
_makePlan({required Hook hook, BuildResult? buildResult}) async =>
967964
_timeAsync('_makePlan', () async {
968965
switch (hook) {
969-
case Hook.build:
966+
case .build:
970967
final planner = await _planner;
971968
final planResult = await planner.makeBuildHookPlan();
972969
if (planResult.isFailure) {
973970
return planResult.asFailure;
974971
}
975972
return Success((planResult.success, planner.packageGraph));
976-
case Hook.link:
973+
case .link:
977974
final planner = await _planner;
978975
final planResult = await planner.makeLinkHookPlan();
979976
if (planResult.isFailure) {
@@ -1004,10 +1001,10 @@ ${e.message}''');
10041001
return const Failure(HooksRunnerFailure.hookRun);
10051002
}
10061003
switch (hook) {
1007-
case Hook.build:
1004+
case .build:
10081005
final buildInput = BuildInput(hookInputJson);
10091006
return Success(buildInput);
1010-
case Hook.link:
1007+
case .link:
10111008
final linkInput = LinkInput(hookInputJson);
10121009
return Success(linkInput);
10131010
}
@@ -1044,7 +1041,7 @@ ${e.message}''');
10441041
return const Failure(HooksRunnerFailure.hookRun);
10451042
}
10461043
switch (hook) {
1047-
case Hook.build:
1044+
case .build:
10481045
final output = BuildOutputMaybeFailure(hookOutputJson);
10491046
switch (output) {
10501047
case BuildOutput _:
@@ -1054,7 +1051,7 @@ ${e.message}''');
10541051
case BuildOutputFailure _:
10551052
return const Failure(HooksRunnerFailure.hookRun);
10561053
}
1057-
case Hook.link:
1054+
case .link:
10581055
final output = LinkOutputMaybeFailure(hookOutputJson);
10591056
switch (output) {
10601057
case LinkOutput _:

pkgs/hooks_runner/lib/src/locking/locking.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'dart:async';
6-
import 'dart:io' show Platform, pid;
6+
import 'dart:io' show FileLock, Platform, pid;
77
import 'package:file/file.dart';
88

99
import 'package:logging/logging.dart';
@@ -85,7 +85,7 @@ Future<T> _runUnderFileLock<T>(
8585
Logger? logger,
8686
}) async {
8787
if (!await file.exists()) await file.create(recursive: true);
88-
final randomAccessFile = await file.open(mode: FileMode.write);
88+
final randomAccessFile = await file.open(mode: .write);
8989
var printed = false;
9090
var errorFromCallback = false;
9191
final stopwatch = Stopwatch()..start();

pkgs/hooks_runner/test/build_runner/build_dependencies_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void main() async {
2828
logger,
2929
dartExecutable,
3030
capturedLogs: logMessages,
31-
buildAssetTypes: [BuildAssetType.code],
31+
buildAssetTypes: [.code],
3232
)).success;
3333
expect(
3434
logMessages.join('\n'),

pkgs/hooks_runner/test/build_runner/build_planner_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void main() async {
3838
fileSystem: const LocalFileSystem(),
3939
);
4040
final packagesWithHook = await nativeAssetsBuildPlanner.packagesWithHook(
41-
Hook.build,
41+
.build,
4242
);
4343
expect(packagesWithHook.length, 1);
4444
final buildPlan = await nativeAssetsBuildPlanner.makeBuildHookPlan();

pkgs/hooks_runner/test/build_runner/build_process_helper.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void main(List<String> args) async {
2020
final target = Target.fromString(args[1]);
2121

2222
final logger = Logger('')
23-
..level = Level.ALL
23+
..level = .ALL
2424
..onRecord.listen((event) => print(event.message));
2525

2626
final targetOS = target.os;
@@ -43,13 +43,13 @@ void main(List<String> args) async {
4343
CodeAssetExtension(
4444
targetArchitecture: target.architecture,
4545
targetOS: targetOS,
46-
macOS: targetOS == OS.macOS
46+
macOS: targetOS == .macOS
4747
? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
4848
: null,
49-
android: targetOS == OS.android
49+
android: targetOS == .android
5050
? AndroidCodeConfig(targetNdkApi: 30)
5151
: null,
52-
linkModePreference: LinkModePreference.dynamic,
52+
linkModePreference: .dynamic,
5353
),
5454
DataAssetsExtension(),
5555
],

pkgs/hooks_runner/test/build_runner/build_runner_asset_id_test.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:logging/logging.dart';
65
import 'package:test/test.dart';
76

87
import '../helpers.dart';
@@ -22,9 +21,9 @@ void main() async {
2221
final logMessages = <String>[];
2322
final result = await build(
2423
packageUri,
25-
createCapturingLogger(logMessages, level: Level.SEVERE),
24+
createCapturingLogger(logMessages, level: .SEVERE),
2625
dartExecutable,
27-
buildAssetTypes: [BuildAssetType.code],
26+
buildAssetTypes: [.code],
2827
);
2928
final fullLog = logMessages.join('\n');
3029
expect(result.isFailure, isTrue);
@@ -52,7 +51,7 @@ void main() async {
5251
packageUri,
5352
logger,
5453
dartExecutable,
55-
buildAssetTypes: [BuildAssetType.code],
54+
buildAssetTypes: [.code],
5655
);
5756
expect(result, isNotNull);
5857
}

pkgs/hooks_runner/test/build_runner/build_runner_build_output_format_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:logging/logging.dart';
65
import 'package:test/test.dart';
76

87
import '../helpers.dart';
@@ -28,7 +27,7 @@ void main() async {
2827
final logMessages = <String>[];
2928
final result = await build(
3029
packageUri,
31-
createCapturingLogger(logMessages, level: Level.SEVERE),
30+
createCapturingLogger(logMessages, level: .SEVERE),
3231
dartExecutable,
3332
buildAssetTypes: [],
3433
);

pkgs/hooks_runner/test/build_runner/build_runner_caching_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void main() async {
3434
logger,
3535
dartExecutable,
3636
capturedLogs: logMessages,
37-
buildAssetTypes: [BuildAssetType.code],
37+
buildAssetTypes: [.code],
3838
userDefines: userDefines,
3939
)).success;
4040
expect(
@@ -78,7 +78,7 @@ void main() async {
7878
logger,
7979
dartExecutable,
8080
capturedLogs: logMessages,
81-
buildAssetTypes: [BuildAssetType.code],
81+
buildAssetTypes: [.code],
8282
userDefines: userDefines,
8383
)).success;
8484
final hookUri = packageUri.resolve('hook/build.dart');
@@ -128,7 +128,7 @@ void main() async {
128128
logger,
129129
dartExecutable,
130130
capturedLogs: logMessages,
131-
buildAssetTypes: [BuildAssetType.code],
131+
buildAssetTypes: [.code],
132132
userDefines: userDefines,
133133
)).success;
134134
expect(
@@ -156,7 +156,7 @@ void main() async {
156156
packageUri,
157157
logger,
158158
dartExecutable,
159-
buildAssetTypes: [BuildAssetType.code],
159+
buildAssetTypes: [.code],
160160
)).success;
161161
await expectSymbols(
162162
asset: CodeAsset.fromEncoded(result.encodedAssets.single),
@@ -175,7 +175,7 @@ void main() async {
175175
packageUri,
176176
logger,
177177
dartExecutable,
178-
buildAssetTypes: [BuildAssetType.code],
178+
buildAssetTypes: [.code],
179179
)).success;
180180

181181
final cUri = packageUri.resolve('src/').resolve('native_add.c');
@@ -238,7 +238,7 @@ void main() async {
238238
packageUri,
239239
logger,
240240
dartExecutable,
241-
buildAssetTypes: [BuildAssetType.code],
241+
buildAssetTypes: [.code],
242242
)).success;
243243

244244
final hookUri = packageUri.resolve('hook/build.dart');
@@ -272,7 +272,7 @@ void main() async {
272272
packageUri,
273273
logger,
274274
dartExecutable,
275-
buildAssetTypes: [BuildAssetType.code],
275+
buildAssetTypes: [.code],
276276
hookEnvironment: modifiedEnvKey == 'PATH'
277277
? null
278278
: filteredEnvironment(
@@ -307,7 +307,7 @@ void main() async {
307307
packageUri,
308308
logger,
309309
dartExecutable,
310-
buildAssetTypes: [BuildAssetType.code],
310+
buildAssetTypes: [.code],
311311
)).success;
312312
expect(logMessages.join('\n'), contains('hook.dill'));
313313
expect(

0 commit comments

Comments
 (0)