Skip to content

Commit 0032ace

Browse files
authored
refactor: avoid generating duplicate assetName field (#99)
1 parent 51c82d7 commit 0032ace

12 files changed

+26
-61
lines changed

example/lib/gen/assets.gen.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ class Assets {
9191
}
9292

9393
class AssetGenImage extends AssetImage {
94-
const AssetGenImage(String assetName)
95-
: _assetName = assetName,
96-
super(assetName, package: 'example');
97-
final String _assetName;
94+
const AssetGenImage(String assetName) : super(assetName, package: 'example');
9895

9996
Image image({
10097
Key? key,
@@ -139,7 +136,7 @@ class AssetGenImage extends AssetImage {
139136
);
140137
}
141138

142-
String get path => _assetName;
139+
String get path => assetName;
143140
}
144141

145142
class SvgGenImage {

packages/core/lib/generators/assets_generator.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,7 @@ class $className {
336336
String _assetGenImageClassDefinition(String packageName) => '''
337337
338338
class AssetGenImage extends AssetImage {
339-
const AssetGenImage(String assetName)
340-
: _assetName = assetName,
341-
super(assetName, package: '$packageName');
342-
final String _assetName;
339+
const AssetGenImage(String assetName) : super(assetName, package: '$packageName');
343340
344341
Image image({
345342
Key? key,
@@ -384,7 +381,7 @@ class AssetGenImage extends AssetImage {
384381
);
385382
}
386383
387-
String get path => _assetName;
384+
String get path => assetName;
388385
}
389386
''';
390387

@@ -393,10 +390,7 @@ class AssetGenImage extends AssetImage {
393390
String _assetGenImageClassDefinitionWithNoNullSafety(String packageName) => '''
394391
395392
class AssetGenImage extends AssetImage {
396-
const AssetGenImage(String assetName)
397-
: _assetName = assetName,
398-
super(assetName, package: '$packageName');
399-
final String _assetName;
393+
const AssetGenImage(String assetName) : super(assetName, package: '$packageName');
400394
401395
Image image({
402396
Key key,
@@ -441,7 +435,7 @@ class AssetGenImage extends AssetImage {
441435
);
442436
}
443437
444-
String get path => _assetName;
438+
String get path => assetName;
445439
}
446440
''';
447441

packages/core/test/gen_test_helper.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ void expectedAssetsGen(String pubspec, String generated, String fact) async {
2424

2525
final actual = generateAssets(
2626
AssetsGenConfig.fromConfig(pubspecFile, config), formatter);
27-
final expected = File(fact).readAsStringSync().replaceAll('\r\n', '\n');
27+
final expected =
28+
formatter.format(File(fact).readAsStringSync().replaceAll('\r\n', '\n'));
2829

2930
expect(
3031
File(generated).readAsStringSync(),

packages/core/test_resources/actual_data/assets.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_camel_case.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_disable_null_safety.gen.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ class Assets {
9090
}
9191

9292
class AssetGenImage extends AssetImage {
93-
const AssetGenImage(String assetName)
94-
: _assetName = assetName,
95-
super(assetName, package: 'test');
96-
final String _assetName;
93+
const AssetGenImage(String assetName) : super(assetName, package: 'test');
9794

9895
Image image({
9996
Key key,
@@ -138,7 +135,7 @@ class AssetGenImage extends AssetImage {
138135
);
139136
}
140137

141-
String get path => _assetName;
138+
String get path => assetName;
142139
}
143140

144141
class SvgGenImage {

packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_ignore_files.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_no_integrations.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_snake_case.gen.dart

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)