Skip to content

Commit ddb91fe

Browse files
authored
[pub_formats] Add analysis options (dart-lang#3083)
1 parent cc90d34 commit ddb91fe

6 files changed

Lines changed: 13 additions & 7 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include: package:dart_flutter_team_lints/analysis_options.yaml

‎pkgs/pub_formats/test/helpers.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Map<String, Object?> loadYamlAsJson(String relativePath) {
1919
final packageRoot = findPackageRoot('pub_formats');
2020
final pubspecFile = File.fromUri(packageRoot.resolve(relativePath));
2121
final json = convertYamlMapToJsonMap(
22-
loadYaml(pubspecFile.readAsStringSync()),
22+
loadYaml(pubspecFile.readAsStringSync()) as YamlMap,
2323
);
2424
return json;
2525
}

‎pkgs/pub_formats/test/package_graph_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void main() {
1515
expect(errors, isEmpty);
1616
expect(
1717
parsed.roots,
18-
equals(["add_asset_link", "app_with_asset_treeshaking"]),
18+
equals(['add_asset_link', 'app_with_asset_treeshaking']),
1919
);
2020
final somePackage = parsed.packages.firstWhere(
2121
(e) => e.name == 'code_assets',

‎pkgs/pub_formats/test/pubspec_lock_test.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ void main() {
4141
expect(
4242
errorsDescription,
4343
equals([
44-
"Unexpected value 'not a valid name' (String) for 'dart_apitool.description.name'. Expected a String satisfying ^[a-zA-Z_]\\w*\$.",
45-
"Unexpected value 'not a valid sha' (String) for 'dart_apitool.description.sha256'. Expected a String satisfying ^[a-f0-9]{64}\$.",
44+
"Unexpected value 'not a valid name' (String) "
45+
"for 'dart_apitool.description.name'. "
46+
'Expected a String satisfying ^[a-zA-Z_]\\w*\$.',
47+
"Unexpected value 'not a valid sha' (String) "
48+
"for 'dart_apitool.description.sha256'. "
49+
'Expected a String satisfying ^[a-f0-9]{64}\$.',
4650
]),
4751
);
4852
expect(() => description.sha256, throwsFormatException);

‎pkgs/pub_formats/test/pubspec_test.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ void main() {
9595
expect(
9696
syntaxError1.validate(),
9797
equals([
98-
"Unexpected value 'not a map' (String) for 'executables'. Expected a Map<String, Object?>?.",
98+
"Unexpected value 'not a map' (String) for 'executables'. "
99+
'Expected a Map<String, Object?>?.',
99100
]),
100101
);
101102
expect(() => syntaxError1.executables, throwsFormatException);

‎pkgs/pub_formats/tool/generate.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ void main(List<String> args) {
4040
'pubspec',
4141
]) {
4242
final schemaFile = File.fromUri(
43-
packageRoot.resolve('doc/schema/${name}.schema.json'),
43+
packageRoot.resolve('doc/schema/$name.schema.json'),
4444
);
4545
final schemaJson = jsonDecode(schemaFile.readAsStringSync());
46-
final schema = JsonSchema.create(schemaJson);
46+
final schema = JsonSchema.create(schemaJson as Object);
4747

4848
final analyzedSchema = SchemaAnalyzer(
4949
schema,

0 commit comments

Comments
 (0)