From d60e9de75d7f2f9c58fa4d9b34ce93edaa43b76c Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Wed, 24 Feb 2021 16:46:03 -0800 Subject: [PATCH] [flutter_tools] remove remaining extensions (#76743) --- .../lib/src/commands/build_ios.dart | 2 +- .../flutter_tools/lib/src/commands/create.dart | 16 ++++++++-------- .../lib/src/flutter_project_metadata.dart | 6 +++--- packages/flutter_tools/lib/src/ios/mac.dart | 10 ++++------ .../lib/src/reporting/github_template.dart | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/build_ios.dart b/packages/flutter_tools/lib/src/commands/build_ios.dart index 24f0ce627c9..3117e1eb81a 100644 --- a/packages/flutter_tools/lib/src/commands/build_ios.dart +++ b/packages/flutter_tools/lib/src/commands/build_ios.dart @@ -255,7 +255,7 @@ abstract class _BuildIOSSubCommand extends BuildSubCommand { if (!result.success) { await diagnoseXcodeBuildFailure(result, globals.flutterUsage, globals.logger); - throwToolExit('Encountered error while ${xcodeBuildAction.name}ing for $logTarget.'); + throwToolExit('Encountered error while ${xcodeBuildActionToString(xcodeBuildAction)}ing for $logTarget.'); } if (buildInfo.codeSizeDirectory != null) { diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 28e013d1ba9..3a87df556d6 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart @@ -34,17 +34,17 @@ class CreateCommand extends CreateBase { argParser.addOption( 'template', abbr: 't', - allowed: FlutterProjectType.values.map((FlutterProjectType type) => type.name), + allowed: FlutterProjectType.values.map(flutterProjectTypeToString), help: 'Specify the type of project to create.', valueHelp: 'type', allowedHelp: { - FlutterProjectType.app.name: '(default) Generate a Flutter application.', - FlutterProjectType.package.name: 'Generate a shareable Flutter project containing modular ' + flutterProjectTypeToString(FlutterProjectType.app): '(default) Generate a Flutter application.', + flutterProjectTypeToString(FlutterProjectType.package): 'Generate a shareable Flutter project containing modular ' 'Dart code.', - FlutterProjectType.plugin.name: 'Generate a shareable Flutter project containing an API ' + flutterProjectTypeToString(FlutterProjectType.plugin): 'Generate a shareable Flutter project containing an API ' 'in Dart code with a platform-specific implementation for Android, for iOS code, or ' 'for both.', - FlutterProjectType.module.name: 'Generate a project to add a Flutter module to an ' + flutterProjectTypeToString(FlutterProjectType.module): 'Generate a project to add a Flutter module to an ' 'existing Android or iOS application.', }, defaultsTo: null, @@ -168,8 +168,8 @@ class CreateCommand extends CreateBase { if (detectedProjectType != null && template != detectedProjectType && metadataExists) { // We can only be definitive that this is the wrong type if the .metadata file // exists and contains a type that doesn't match. - throwToolExit("The requested template type '${template.name}' doesn't match the " - "existing template type of '${detectedProjectType.name}'."); + throwToolExit("The requested template type '${flutterProjectTypeToString(template)}' doesn't match the " + "existing template type of '${flutterProjectTypeToString(detectedProjectType)}'."); } return template; } @@ -189,7 +189,7 @@ class CreateCommand extends CreateBase { if (argResults['template'] != null && stringToProjectType(stringArg('template') ?? 'app') != FlutterProjectType.app) { throwToolExit('Cannot specify --sample with a project type other than ' - '"${FlutterProjectType.app.name}"'); + '"${flutterProjectTypeToString(FlutterProjectType.app)}"'); } // Fetch the sample from the server. sampleCode = await _fetchSampleFromServer(stringArg('sample')); diff --git a/packages/flutter_tools/lib/src/flutter_project_metadata.dart b/packages/flutter_tools/lib/src/flutter_project_metadata.dart index b41b5458d82..52fe757a873 100644 --- a/packages/flutter_tools/lib/src/flutter_project_metadata.dart +++ b/packages/flutter_tools/lib/src/flutter_project_metadata.dart @@ -25,14 +25,14 @@ enum FlutterProjectType { plugin, } -extension FlutterProjectTypeExtension on FlutterProjectType { - String get name => getEnumName(this); +String flutterProjectTypeToString(FlutterProjectType type) { + return getEnumName(type); } FlutterProjectType stringToProjectType(String value) { FlutterProjectType result; for (final FlutterProjectType type in FlutterProjectType.values) { - if (value == type.name) { + if (value == flutterProjectTypeToString(type)) { result = type; break; } diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 1472954400f..ca0475cca6b 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -346,10 +346,10 @@ Future buildXcodeProject({ initialBuildStatus?.cancel(); initialBuildStatus = null; globals.printStatus( - 'Xcode ${buildAction.name} done.'.padRight(kDefaultStatusPadding + 1) + 'Xcode ${xcodeBuildActionToString(buildAction)} done.'.padRight(kDefaultStatusPadding + 1) + getElapsedAsSeconds(sw.elapsed).padLeft(5), ); - globals.flutterUsage.sendTiming(buildAction.name, 'xcode-ios', Duration(milliseconds: sw.elapsedMilliseconds)); + globals.flutterUsage.sendTiming(xcodeBuildActionToString(buildAction), 'xcode-ios', Duration(milliseconds: sw.elapsedMilliseconds)); // Run -showBuildSettings again but with the exact same parameters as the // build. showBuildSettings is reported to occasionally timeout. Here, we give @@ -592,9 +592,8 @@ Future diagnoseXcodeBuildFailure(XcodeBuildResult result, Usage flutterUsa /// `clean`, `test`, `analyze`, and `install` are not supported. enum XcodeBuildAction { build, archive } -extension XcodeBuildActionExtension on XcodeBuildAction { - String get name { - switch (this) { +String xcodeBuildActionToString(XcodeBuildAction action) { + switch (action) { case XcodeBuildAction.build: return 'build'; case XcodeBuildAction.archive: @@ -602,7 +601,6 @@ extension XcodeBuildActionExtension on XcodeBuildAction { default: throw UnsupportedError('Unknown Xcode build action'); } - } } class XcodeBuildResult { diff --git a/packages/flutter_tools/lib/src/reporting/github_template.dart b/packages/flutter_tools/lib/src/reporting/github_template.dart index cae85aa6c0b..6307bb8bbf6 100644 --- a/packages/flutter_tools/lib/src/reporting/github_template.dart +++ b/packages/flutter_tools/lib/src/reporting/github_template.dart @@ -121,7 +121,7 @@ ${_projectMetadataInformation()} } final FlutterProjectMetadata metadata = FlutterProjectMetadata(project.metadataFile, _logger); final StringBuffer description = StringBuffer() - ..writeln('**Type**: ${metadata.projectType?.name}') + ..writeln('**Type**: ${flutterProjectTypeToString(metadata.projectType)}') ..writeln('**Version**: ${manifest.appVersion}') ..writeln('**Material**: ${manifest.usesMaterialDesign}') ..writeln('**Android X**: ${manifest.usesAndroidX}')