[flutter_tool] Use curly braces around single statment control structures (#40446)
diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart
index 1c3887f..247a21d 100644
--- a/packages/flutter_tools/lib/src/flutter_manifest.dart
+++ b/packages/flutter_tools/lib/src/flutter_manifest.dart
@@ -27,8 +27,9 @@
/// Returns null on invalid manifest. Returns empty manifest on missing file.
static FlutterManifest createFromPath(String path) {
- if (path == null || !fs.isFileSync(path))
+ if (path == null || !fs.isFileSync(path)) {
return _createFromYaml(null);
+ }
final String manifest = fs.file(path).readAsStringSync();
return createFromString(manifest);
}
@@ -41,8 +42,9 @@
static FlutterManifest _createFromYaml(dynamic yamlDocument) {
final FlutterManifest pubspec = FlutterManifest._();
- if (yamlDocument != null && !_validate(yamlDocument))
+ if (yamlDocument != null && !_validate(yamlDocument)) {
return null;
+ }
final Map<dynamic, dynamic> yamlMap = yamlDocument;
if (yamlMap != null) {
@@ -99,10 +101,10 @@
/// The build version name from the `pubspec.yaml` file.
/// Can be null if version isn't set or has a wrong format.
String get buildName {
- if (appVersion != null && appVersion.contains('+'))
+ if (appVersion != null && appVersion.contains('+')) {
return appVersion.split('+')?.elementAt(0);
- else
- return appVersion;
+ }
+ return appVersion;
}
/// The build version number from the `pubspec.yaml` file.
@@ -150,8 +152,9 @@
/// module or plugin descriptor. Returns null, if there is no
/// such declaration.
String get androidPackage {
- if (isModule)
+ if (isModule) {
return _flutterDescriptor['module']['androidPackage'];
+ }
if (isPlugin) {
final YamlMap plugin = _flutterDescriptor['plugin'];
if (plugin.containsKey('platforms')) {
@@ -166,8 +169,9 @@
/// Returns the iOS bundle identifier declared by this manifest in its
/// module descriptor. Returns null if there is no such declaration.
String get iosBundleIdentifier {
- if (isModule)
+ if (isModule) {
return _flutterDescriptor['module']['iosBundleIdentifier'];
+ }
return null;
}
@@ -202,8 +206,9 @@
}
List<Font> _extractFonts() {
- if (!_flutterDescriptor.containsKey('fonts'))
+ if (!_flutterDescriptor.containsKey('fonts')) {
return <Font>[];
+ }
final List<Font> fonts = <Font>[];
for (Map<String, dynamic> fontFamily in _rawFontsDescriptor) {
@@ -232,8 +237,9 @@
style: fontFile['style'],
));
}
- if (fontAssets.isNotEmpty)
+ if (fontAssets.isNotEmpty) {
fonts.add(Font(fontFamily['family'], fontAssets));
+ }
}
return fonts;
}
@@ -269,11 +275,13 @@
Map<String, dynamic> get descriptor {
final Map<String, dynamic> descriptor = <String, dynamic>{};
- if (weight != null)
+ if (weight != null) {
descriptor['weight'] = weight;
+ }
- if (style != null)
+ if (style != null) {
descriptor['style'] = style;
+ }
descriptor['asset'] = assetUri.path;
return descriptor;