From 4bb609608658aa695a04b046ec166756b3fe3629 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Thu, 25 Jun 2020 15:44:57 -0700
Subject: [PATCH] [flutter_tools] surface null safety/experiment flags in
 attach (#60317)

Missed this one. Needed for google3 and add2app workflows
---
 packages/flutter_tools/lib/src/commands/attach.dart       | 2 ++
 .../test/general.shard/commands/build_test.dart           | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart
index 853f2798917..328e5782672 100644
--- a/packages/flutter_tools/lib/src/commands/attach.dart
+++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -63,6 +63,8 @@ class AttachCommand extends FlutterCommand {
     usesFuchsiaOptions(hide: !verboseHelp);
     usesDartDefineOption();
     usesDeviceUserOption();
+    addEnableExperimentation(hide: !verboseHelp);
+    addNullSafetyModeOptions(hide: !verboseHelp);
     argParser
       ..addOption(
         'debug-port',
diff --git a/packages/flutter_tools/test/general.shard/commands/build_test.dart b/packages/flutter_tools/test/general.shard/commands/build_test.dart
index 899879c58ba..0c0acfda014 100644
--- a/packages/flutter_tools/test/general.shard/commands/build_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_test.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:args/args.dart';
-import 'package:flutter_tools/src/commands/build.dart';
+import 'package:flutter_tools/src/commands/attach.dart';
 import 'package:flutter_tools/src/commands/build_aar.dart';
 import 'package:flutter_tools/src/commands/build_apk.dart';
 import 'package:flutter_tools/src/commands/build_appbundle.dart';
@@ -15,13 +15,14 @@ import 'package:flutter_tools/src/commands/build_macos.dart';
 import 'package:flutter_tools/src/commands/build_web.dart';
 import 'package:flutter_tools/src/commands/build_windows.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:flutter_tools/src/runner/flutter_command.dart';
 
 import '../../src/common.dart';
 import '../../src/context.dart';
 
 void main() {
   testUsingContext('All build commands support null safety options', () {
-    final List<BuildSubCommand> commands = <BuildSubCommand>[
+    final List<FlutterCommand> commands = <FlutterCommand>[
       BuildWindowsCommand(verboseHelp: false),
       BuildLinuxCommand(verboseHelp: false),
       BuildMacosCommand(verboseHelp: false),
@@ -32,9 +33,10 @@ void main() {
       BuildFuchsiaCommand(verboseHelp: false),
       BuildAarCommand(verboseHelp: false),
       BuildIOSFrameworkCommand(verboseHelp: false, buildSystem: globals.buildSystem),
+      AttachCommand(verboseHelp: false),
     ];
 
-    for (final BuildSubCommand command in commands) {
+    for (final FlutterCommand command in commands) {
       final ArgResults results = command.argParser.parse(<String>[
         '--sound-null-safety',
         '--enable-experiment=non-nullable',