Skip to content

Commit a751764

Browse files
dcharkesdcharkes
committed
[hooks_runner] Use dot shorthands
1 parent 77d80f4 commit a751764

33 files changed

+117
-127
lines changed

‎pkgs/hooks/pubspec.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ dev_dependencies:
3939
path: ../json_syntax_generator/
4040
native_test_helpers:
4141
path: ../native_test_helpers/
42+
native_toolchain_c: any
4243
path: ^1.9.1
4344
test: ^1.25.15

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

Lines changed: 2 additions & 2 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

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

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class NativeAssetsBuildRunner {
9393
/// flutter_tools (for `flutter run` and `flutter build`).
9494
Future<List<String>> packagesWithBuildHooks() async {
9595
final planner = await _planner;
96-
final packagesWithHook = await planner.packagesWithHook(Hook.build);
96+
final packagesWithHook = await planner.packagesWithHook(.build);
9797
return packagesWithHook.map((e) => e.name).toList();
9898
}
9999

@@ -105,7 +105,7 @@ class NativeAssetsBuildRunner {
105105
for (final error in loadedUserDefines!.pubspecErrors) {
106106
logger.severe(error);
107107
}
108-
return const Failure(HooksRunnerFailure.projectConfig);
108+
return const Failure(.projectConfig);
109109
}
110110
return Success(
111111
HookResult(
@@ -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
}
@@ -171,7 +171,7 @@ class NativeAssetsBuildRunner {
171171
inputBuilder.setupBuildInput(assets: assetsForBuild);
172172

173173
final (buildDirUri, outDirUri, outDirSharedUri) = await _setupDirectories(
174-
Hook.build,
174+
.build,
175175
inputBuilder,
176176
package,
177177
);
@@ -191,11 +191,11 @@ class NativeAssetsBuildRunner {
191191
];
192192
if (errors.isNotEmpty) {
193193
_printErrors('Build input for ${package.name} contains errors', errors);
194-
return const Failure(HooksRunnerFailure.internal);
194+
return const Failure(.internal);
195195
}
196196

197197
final result = await _runHookForPackageCached(
198-
Hook.build,
198+
.build,
199199
input,
200200
(input, output) async => [
201201
for (final e in extensions)
@@ -229,7 +229,7 @@ class NativeAssetsBuildRunner {
229229
if (errors.isEmpty) return Success(hookResult);
230230

231231
_printErrors('Application asset verification failed', errors);
232-
return const Failure(HooksRunnerFailure.hookRun);
232+
return const Failure(.hookRun);
233233
});
234234

235235
/// This method is invoked by launchers such as dartdev (for `dart run`) and
@@ -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) {
@@ -282,7 +279,7 @@ class NativeAssetsBuildRunner {
282279
logger.severe(
283280
'Failed to parse resource identifiers from $resourceIdentifiers: $e',
284281
);
285-
return const Failure(HooksRunnerFailure.internal);
282+
return const Failure(.internal);
286283
}
287284
}
288285

@@ -306,7 +303,7 @@ class NativeAssetsBuildRunner {
306303
}
307304

308305
final (buildDirUri, outDirUri, outDirSharedUri) = await _setupDirectories(
309-
Hook.link,
306+
.link,
310307
inputBuilder,
311308
package,
312309
);
@@ -346,11 +343,11 @@ class NativeAssetsBuildRunner {
346343
];
347344
if (errors.isNotEmpty) {
348345
_printErrors('Link input for ${package.name} contains errors', errors);
349-
return const Failure(HooksRunnerFailure.internal);
346+
return const Failure(.internal);
350347
}
351348

352349
final result = await _runHookForPackageCached(
353-
Hook.link,
350+
.link,
354351
input,
355352
(input, output) async => [
356353
for (final e in extensions)
@@ -392,7 +389,7 @@ class NativeAssetsBuildRunner {
392389
if (errors.isEmpty) return Success(linkResult);
393390

394391
_printErrors('Application asset verification failed', errors);
395-
return const Failure(HooksRunnerFailure.hookRun);
392+
return const Failure(.hookRun);
396393
});
397394

398395
void _printErrors(String message, ValidationErrors errors) {
@@ -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) {
@@ -1001,13 +998,13 @@ ${hookInputFile.uri.toFilePath()} contained a format error.
1001998
1002999
Contents: $fileContents.
10031000
${e.message}''');
1004-
return const Failure(HooksRunnerFailure.hookRun);
1001+
return const Failure(.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
}
@@ -1028,7 +1025,7 @@ Building assets for package:$packageName failed.
10281025
Error reading ${hookOutputFile.uri.toFilePath()}.
10291026
10301027
${e.message}''');
1031-
return const Failure(HooksRunnerFailure.hookRun);
1028+
return const Failure(.hookRun);
10321029
}
10331030
logger.info('output.json contents:\n$fileContents');
10341031
final Map<String, Object?> hookOutputJson;
@@ -1041,28 +1038,28 @@ ${hookOutputFile.uri.toFilePath()} contained a format error.
10411038
10421039
Contents: $fileContents.
10431040
${e.message}''');
1044-
return const Failure(HooksRunnerFailure.hookRun);
1041+
return const Failure(.hookRun);
10451042
}
10461043
switch (hook) {
1047-
case Hook.build:
1044+
case .build:
10481045
final output = BuildOutputMaybeFailure(hookOutputJson);
10491046
switch (output) {
10501047
case BuildOutput _:
10511048
return Success(output);
10521049
case BuildOutputFailure(type: FailureType.infra):
1053-
return const Failure(HooksRunnerFailure.infra);
1050+
return const Failure(.infra);
10541051
case BuildOutputFailure _:
1055-
return const Failure(HooksRunnerFailure.hookRun);
1052+
return const Failure(.hookRun);
10561053
}
1057-
case Hook.link:
1054+
case .link:
10581055
final output = LinkOutputMaybeFailure(hookOutputJson);
10591056
switch (output) {
10601057
case LinkOutput _:
10611058
return Success(output);
10621059
case LinkOutputFailure(type: FailureType.infra):
1063-
return const Failure(HooksRunnerFailure.infra);
1060+
return const Failure(.infra);
10641061
case LinkOutputFailure _:
1065-
return const Failure(HooksRunnerFailure.hookRun);
1062+
return const Failure(.hookRun);
10661063
}
10671064
}
10681065
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ 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();
9292
while (timeout == null || stopwatch.elapsed < timeout) {
9393
try {
94-
await randomAccessFile.lock(FileLock.exclusive);
94+
await randomAccessFile.lock(.exclusive);
9595
try {
9696
await randomAccessFile.writeString(
9797
'Last acquired by ${Platform.resolvedExecutable} '

‎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)