From 83bfab53760ceecbba32ce921e0d279ae9508a9c Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@users.noreply.github.com>
Date: Tue, 16 Jul 2024 21:01:28 -0700
Subject: [PATCH] flutter_tool: DRY up arg helpers, use new typed arg functions
 (#151784)

---
 .../lib/src/runner/flutter_command.dart           | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index e4e474ab6e8..da635715c6b 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1884,10 +1884,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
   /// If no flag named [name] was added to the [ArgParser], an [ArgumentError]
   /// will be thrown.
   bool boolArg(String name, {bool global = false}) {
-    if (global) {
-      return globalResults![name] as bool;
-    }
-    return argResults![name] as bool;
+    return (global ? globalResults : argResults)!.flag(name);
   }
 
   /// Gets the parsed command-line option named [name] as a `String`.
@@ -1895,18 +1892,12 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
   /// If no option named [name] was added to the [ArgParser], an [ArgumentError]
   /// will be thrown.
   String? stringArg(String name, {bool global = false}) {
-    if (global) {
-      return globalResults![name] as String?;
-    }
-    return argResults![name] as String?;
+    return (global ? globalResults : argResults)!.option(name);
   }
 
   /// Gets the parsed command-line option named [name] as `List<String>`.
   List<String> stringsArg(String name, {bool global = false}) {
-    if (global) {
-      return globalResults![name] as List<String>;
-    }
-    return argResults![name] as List<String>;
+    return (global ? globalResults : argResults)!.multiOption(name);
   }
 }