Revert "Esarbanis flutter run help (flutter#48314)" (flutter#48351)

This reverts commit 866fa64.

Author: zanderso

AUTHORS

@@ -49,4 +49,3 @@ Robin Jespersen <info@unitedpartners.de>
 Jefferson Quesado <jeff.quesado@gmail.com>
 Mark Diener <rpzrpzrpz@gmail.com>
 Alek Åström <alek.astrom@gmail.com>
-Efthymios Sarpmpanis <e.sarbanis@gmail.com>

packages/flutter_tools/lib/src/base/command_help.dart

@@ -9,7 +9,6 @@ import 'package:meta/meta.dart';
 import 'application_package.dart';
 import 'artifacts.dart';
 import 'asset.dart';
-import 'base/command_help.dart';
 import 'base/common.dart';
 import 'base/file_system.dart';
 import 'base/io.dart' as io;
@@ -1004,30 +1003,23 @@ abstract class ResidentRunner {
   void printHelp({ @required bool details });
 
   void printHelpDetails() {
-    if (flutterDevices.any((FlutterDevice d) => d.device.supportsScreenshot)) {
-      CommandHelp.s.print();
-    }
     if (supportsServiceProtocol) {
-      CommandHelp.w.print();
-      CommandHelp.t.print();
+      globals.printStatus('You can dump the widget hierarchy of the app (debugDumpApp) by pressing "w".');
+      globals.printStatus('To dump the rendering tree of the app (debugDumpRenderTree), press "t".');
       if (isRunningDebug) {
-        CommandHelp.L.print();
-        CommandHelp.S.print();
-        CommandHelp.U.print();
-        CommandHelp.i.print();
-        CommandHelp.p.print();
-        CommandHelp.o.print();
-        CommandHelp.z.print();
+        globals.printStatus('For layers (debugDumpLayerTree), use "L"; for accessibility (debugDumpSemantics), use "S" (for traversal order) or "U" (for inverse hit test order).');
+        globals.printStatus('To toggle the widget inspector (WidgetsApp.showWidgetInspectorOverride), press "i".');
+        globals.printStatus('To toggle the display of construction lines (debugPaintSizeEnabled), press "p".');
+        globals.printStatus('To simulate different operating systems, (defaultTargetPlatform), press "o".');
+        globals.printStatus('To toggle the elevation checker, press "z".');
       } else {
-        CommandHelp.S.print();
-        CommandHelp.U.print();
+        globals.printStatus('To dump the accessibility tree (debugDumpSemantics), press "S" (for traversal order) or "U" (for inverse hit test order).');
       }
-      // `P` should precede `a`
-      CommandHelp.P.print();
-      CommandHelp.a.print();
+      globals.printStatus('To display the performance overlay (WidgetsApp.showPerformanceOverlay), press "P".');
+      globals.printStatus('To enable timeline events for all widget build methods, (debugProfileWidgetBuilds), press "a"');
     }
     if (flutterDevices.any((FlutterDevice d) => d.device.supportsScreenshot)) {
-      CommandHelp.s.print();
+      globals.printStatus('To save a screenshot to flutter.png, press "s".');
     }
   }
 

packages/flutter_tools/lib/src/resident_runner.dart

@@ -6,7 +6,6 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 
-import 'base/command_help.dart';
 import 'base/file_system.dart';
 import 'device.dart';
 import 'globals.dart' as globals;
@@ -180,24 +179,32 @@ class ColdRunner extends ResidentRunner {
 
   @override
   void printHelp({ @required bool details }) {
-    globals.printStatus('Flutter run key commands.');
-    if (supportsServiceProtocol) {
-      if (details) {
-        printHelpDetails();
-      }
-    }
-    CommandHelp.h.print();
-    if (_didAttach) {
-      CommandHelp.d.print();
-    }
-    CommandHelp.q.print();
+    bool haveDetails = false;
+    bool haveAnything = false;
     for (final FlutterDevice device in flutterDevices) {
       final String dname = device.device.name;
       if (device.vmService != null) {
         globals.printStatus('An Observatory debugger and profiler on $dname is '
-          'available at: ${device.vmService.httpAddress}');
+          'available at: ${device.vmService .httpAddress}');
       }
     }
+    if (supportsServiceProtocol) {
+      haveDetails = true;
+      if (details) {
+        printHelpDetails();
+        haveAnything = true;
+      }
+    }
+    final String quitMessage = _didAttach
+      ? 'To detach, press "d"; to quit, press "q".'
+      : 'To quit, press "q".';
+    if (haveDetails && !details) {
+      globals.printStatus('For a more detailed help message, press "h". $quitMessage');
+    } else if (haveAnything) {
+      globals.printStatus('To repeat this help message, press "h". $quitMessage');
+    } else {
+      globals.printStatus(quitMessage);
+    }
   }
 
   @override

packages/flutter_tools/lib/src/run_cold.dart

@@ -9,12 +9,12 @@ import 'package:json_rpc_2/error_code.dart' as rpc_error_code;
 import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
 import 'package:meta/meta.dart';
 import 'package:pool/pool.dart';
-import 'base/async_guard.dart';
 
-import 'base/command_help.dart';
+import 'base/async_guard.dart';
 import 'base/context.dart';
 import 'base/file_system.dart';
 import 'base/logger.dart';
+import 'base/terminal.dart';
 import 'base/utils.dart';
 import 'build_info.dart';
 import 'compile.dart';
@@ -1045,23 +1045,29 @@ class HotRunner extends ResidentRunner {
 
   @override
   void printHelp({ @required bool details }) {
-    globals.printStatus('Flutter run key commands.');
-    CommandHelp.r.print();
+    const String fire = '🔥';
+    String rawMessage = '  To hot reload changes while running, press "r". ';
     if (canHotRestart) {
-      CommandHelp.R.print();
-    }
-    CommandHelp.h.print();
-    if (_didAttach) {
-      CommandHelp.d.print();
-    }
-    CommandHelp.q.print();
-    if (details) {
-      printHelpDetails();
+      rawMessage += 'To hot restart (and rebuild state), press "R".';
     }
+    final String message = globals.terminal.color(
+      fire + globals.terminal.bolden(rawMessage),
+      TerminalColor.red,
+    );
+    globals.printStatus(message);
     for (final FlutterDevice device in flutterDevices) {
       final String dname = device.device.name;
       globals.printStatus('An Observatory debugger and profiler on $dname is '
-          'available at:\n${device.vmService.httpAddress}');
+        'available at: ${device.vmService.httpAddress}');
+    }
+    final String quitMessage = _didAttach
+        ? 'To detach, press "d"; to quit, press "q".'
+        : 'To quit, press "q".';
+    if (details) {
+      printHelpDetails();
+      globals.printStatus('To repeat this help message, press "h". $quitMessage');
+    } else {
+      globals.printStatus('For a more detailed help message, press "h". $quitMessage');
     }
   }
 

packages/flutter_tools/lib/src/run_hot.dart

@@ -165,10 +165,7 @@ void main() {
               if (message == '[stdout] Lost connection to device.') {
                 observatoryLogs.add(message);
               }
-              if (message.contains('Hot reload.')) {
-                observatoryLogs.add(message);
-              }
-              if (message.contains('Hot restart.')) {
+              if (message.contains('To hot reload changes while running, press "r". To hot restart (and rebuild state), press "R".')) {
                 observatoryLogs.add(message);
               }
             });
@@ -206,16 +203,14 @@ void main() {
           }));
         });
 
-        expect(observatoryLogs.length, 9);
+        expect(observatoryLogs.length, 7);
         expect(observatoryLogs[0], '[stdout] Waiting for a connection from Flutter on MockAndroidDevice...');
         expect(observatoryLogs[1], '[verbose] Observatory URL on device: http://127.0.0.1:1234');
         expect(observatoryLogs[2], '[stdout] Lost connection to device.');
-        expect(observatoryLogs[3].contains('Hot reload.'), isTrue);
-        expect(observatoryLogs[4].contains('Hot restart.'), isTrue);
-        expect(observatoryLogs[5], '[verbose] Observatory URL on device: http://127.0.0.1:1235');
-        expect(observatoryLogs[6], '[stdout] Lost connection to device.');
-        expect(observatoryLogs[7].contains('Hot reload.'), isTrue);
-        expect(observatoryLogs[8].contains('Hot restart.'), isTrue);
+        expect(observatoryLogs[3].contains('To hot reload changes while running, press "r". To hot restart (and rebuild state), press "R"'), isTrue);
+        expect(observatoryLogs[4], '[verbose] Observatory URL on device: http://127.0.0.1:1235');
+        expect(observatoryLogs[5], '[stdout] Lost connection to device.');
+        expect(observatoryLogs[6].contains('To hot reload changes while running, press "r". To hot restart (and rebuild state), press "R"'), isTrue);
 
         verify(portForwarder.forward(1234, hostPort: anyNamed('hostPort'))).called(1);
         verify(portForwarder.forward(1235, hostPort: anyNamed('hostPort'))).called(1);