Re-land text wrapping/color PR (#22831)
This attempts to re-land #22656.
There are two changes from the original:
I turned off wrapping completely when not sending output to a terminal. Previously I had defaulted to wrapping at and arbitrary 100 chars in that case, just to keep long messages from being too long, but that turns out the be a bad idea because there are tests that are relying on the specific form of the output. It's also pretty arbitrary, and mostly people sending output to a non-terminal will want unwrapped text.
I found a better way to terminate ANSI color/bold sequences, so that they can be embedded within each other without needed quite as complex a dance with removing redundant sequences.
As part of these changes, I removed the Logger.supportsColor setter so that the one source of truth for color support is in AnsiTerminal.supportsColor.
* Turn on line wrapping again in usage and status messages, adds ANSI color to doctor and analysis messages. (#22656)
This turns on text wrapping for usage messages and status messages. When on a terminal, wraps to the width of the terminal. When writing to a non-terminal, wrap lines at a default column width (currently defined to be 100 chars). If --no-wrap is specified, then no wrapping occurs. If --wrap-column is specified, wraps to that column (if --wrap is on).
Adds ANSI color to the doctor and analysis output on terminals. This is in this PR with the wrapping, since wrapping needs to know how to count visible characters in the presence of ANSI sequences. (This is just one more step towards re-implementing all of Curses for Flutter. :-)) Will not print ANSI sequences when sent to a non-terminal, or of --no-color is specified.
Fixes ANSI color and bold sequences so that they can be combined (bold, colored text), and a small bug in indentation calculation for wrapping.
Since wrapping is now turned on, also removed many redundant '\n's in the code.diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart
index ddb18d3..5cbc68b 100644
--- a/packages/flutter_tools/lib/src/commands/analyze.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -20,7 +20,7 @@
help: 'Analyze the current project, if applicable.', defaultsTo: true);
argParser.addFlag('dartdocs',
negatable: false,
- help: 'List every public member that is lacking documentation.\n'
+ help: 'List every public member that is lacking documentation. '
'(The public_member_api_docs lint must be enabled in analysis_options.yaml)',
hide: !verboseHelp);
argParser.addFlag('watch',
@@ -45,7 +45,7 @@
// Not used by analyze --watch
argParser.addFlag('congratulate',
- help: 'Show output even when there are no errors, warnings, hints, or lints.\n'
+ help: 'Show output even when there are no errors, warnings, hints, or lints. '
'Ignored if --watch is specified.',
defaultsTo: true);
argParser.addFlag('preamble',
diff --git a/packages/flutter_tools/lib/src/commands/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart
index d7a13d0..faadddc 100644
--- a/packages/flutter_tools/lib/src/commands/analyze_once.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart
@@ -132,7 +132,7 @@
printStatus('');
errors.sort();
for (AnalysisError error in errors)
- printStatus(error.toString());
+ printStatus(error.toString(), hangingIndent: 7);
final String seconds = (timer.elapsedMilliseconds / 1000.0).toStringAsFixed(1);
diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart
index 35e44ac..c22cc0f 100644
--- a/packages/flutter_tools/lib/src/commands/attach.dart
+++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -50,7 +50,7 @@
)..addFlag('machine',
hide: !verboseHelp,
negatable: false,
- help: 'Handle machine structured JSON command input and provide output\n'
+ help: 'Handle machine structured JSON command input and provide output '
'and progress in machine friendly format.',
);
hotRunnerFactory ??= HotRunnerFactory();
diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart
index cc2b4b6..15474ce 100644
--- a/packages/flutter_tools/lib/src/commands/build_apk.dart
+++ b/packages/flutter_tools/lib/src/commands/build_apk.dart
@@ -34,8 +34,8 @@
@override
final String description = 'Build an Android APK file from your app.\n\n'
- 'This command can build debug and release versions of your application. \'debug\' builds support\n'
- 'debugging and a quick development cycle. \'release\' builds don\'t support debugging and are\n'
+ 'This command can build debug and release versions of your application. \'debug\' builds support '
+ 'debugging and a quick development cycle. \'release\' builds don\'t support debugging and are '
'suitable for deploying to app stores.';
@override
diff --git a/packages/flutter_tools/lib/src/commands/build_bundle.dart b/packages/flutter_tools/lib/src/commands/build_bundle.dart
index c747fd3..da21e2f 100644
--- a/packages/flutter_tools/lib/src/commands/build_bundle.dart
+++ b/packages/flutter_tools/lib/src/commands/build_bundle.dart
@@ -34,19 +34,19 @@
)
..addOption('precompile',
hide: !verboseHelp,
- help: 'Precompile functions specified in input file. This flag is only\n'
- 'allowed when using --dynamic. It takes a Dart compilation trace\n'
- 'file produced by the training run of the application. With this\n'
- 'flag, instead of using default Dart VM snapshot provided by the\n'
- 'engine, the application will use its own snapshot that includes\n'
+ help: 'Precompile functions specified in input file. This flag is only '
+ 'allowed when using --dynamic. It takes a Dart compilation trace '
+ 'file produced by the training run of the application. With this '
+ 'flag, instead of using default Dart VM snapshot provided by the '
+ 'engine, the application will use its own snapshot that includes '
'additional compiled functions.'
)
..addFlag('hotupdate',
hide: !verboseHelp,
- help: 'Build differential snapshot based on the last state of the build\n'
- 'tree and any changes to the application source code since then.\n'
- 'This flag is only allowed when using --dynamic. With this flag,\n'
- 'a partial VM snapshot is generated that is loaded on top of the\n'
+ help: 'Build differential snapshot based on the last state of the build '
+ 'tree and any changes to the application source code since then. '
+ 'This flag is only allowed when using --dynamic. With this flag, '
+ 'a partial VM snapshot is generated that is loaded on top of the '
'original VM snapshot that contains precompiled code.'
)
..addMultiOption(FlutterOptions.kExtraFrontEndOptions,
diff --git a/packages/flutter_tools/lib/src/commands/config.dart b/packages/flutter_tools/lib/src/commands/config.dart
index 8109f8d..b1e0c2d 100644
--- a/packages/flutter_tools/lib/src/commands/config.dart
+++ b/packages/flutter_tools/lib/src/commands/config.dart
@@ -35,7 +35,7 @@
final String description =
'Configure Flutter settings.\n\n'
'To remove a setting, configure it to an empty string.\n\n'
- 'The Flutter tool anonymously reports feature usage statistics and basic crash reports to help improve\n'
+ 'The Flutter tool anonymously reports feature usage statistics and basic crash reports to help improve '
'Flutter tools over time. See Google\'s privacy policy: https://www.google.com/intl/en/policies/privacy/';
@override
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart
index a99b75c..2711780 100644
--- a/packages/flutter_tools/lib/src/commands/create.dart
+++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -92,7 +92,7 @@
argParser.addOption(
'org',
defaultsTo: 'com.example',
- help: 'The organization responsible for your new Flutter project, in reverse domain name notation.\n'
+ help: 'The organization responsible for your new Flutter project, in reverse domain name notation. '
'This string is used in Java package names and as prefix in the iOS bundle identifier.'
);
argParser.addOption(
@@ -174,7 +174,7 @@
}
if (Cache.flutterRoot == null)
- throwToolExit('Neither the --flutter-root command line flag nor the FLUTTER_ROOT environment\n'
+ throwToolExit('Neither the --flutter-root command line flag nor the FLUTTER_ROOT environment '
'variable was specified. Unable to find package:flutter.', exitCode: 2);
await Cache.instance.updateAll();
@@ -230,7 +230,7 @@
organization = existingOrganizations.first;
} else if (1 < existingOrganizations.length) {
throwToolExit(
- 'Ambiguous organization in existing files: $existingOrganizations.\n'
+ 'Ambiguous organization in existing files: $existingOrganizations. '
'The --org command line argument must be specified to recreate project.'
);
}
@@ -554,7 +554,7 @@
/// if we should disallow the directory name.
String _validateProjectDir(String dirPath, { String flutterRoot }) {
if (fs.path.isWithin(flutterRoot, dirPath)) {
- return 'Cannot create a project within the Flutter SDK.\n'
+ return 'Cannot create a project within the Flutter SDK. '
"Target directory '$dirPath' is within the Flutter SDK at '$flutterRoot'.";
}
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart
index f8bf5a7..ae5da50 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -749,18 +749,26 @@
Stream<LogMessage> get onMessage => _messageController.stream;
@override
- void printError(String message, { StackTrace stackTrace, bool emphasis = false, TerminalColor color }) {
+ void printError(
+ String message, {
+ StackTrace stackTrace,
+ bool emphasis = false,
+ TerminalColor color,
+ int indent,
+ int hangingIndent,
+ }) {
_messageController.add(LogMessage('error', message, stackTrace));
}
@override
void printStatus(
String message, {
- bool emphasis = false,
- TerminalColor color,
- bool newline = true,
- int indent,
- }) {
+ bool emphasis = false,
+ TerminalColor color,
+ bool newline = true,
+ int indent,
+ int hangingIndent,
+ }) {
_messageController.add(LogMessage('status', message));
}
@@ -875,9 +883,22 @@
int _nextProgressId = 0;
@override
- void printError(String message, { StackTrace stackTrace, bool emphasis, TerminalColor color}) {
+ void printError(
+ String message, {
+ StackTrace stackTrace,
+ bool emphasis,
+ TerminalColor color,
+ int indent,
+ int hangingIndent,
+ }) {
if (parent != null) {
- parent.printError(message, stackTrace: stackTrace, emphasis: emphasis);
+ parent.printError(
+ message,
+ stackTrace: stackTrace,
+ emphasis: emphasis,
+ indent: indent,
+ hangingIndent: hangingIndent,
+ );
} else {
if (stackTrace != null) {
_sendLogEvent(<String, dynamic>{
@@ -897,11 +918,12 @@
@override
void printStatus(
String message, {
- bool emphasis = false,
- TerminalColor color,
- bool newline = true,
- int indent,
- }) {
+ bool emphasis = false,
+ TerminalColor color,
+ bool newline = true,
+ int indent,
+ int hangingIndent,
+ }) {
if (parent != null) {
parent.printStatus(
message,
@@ -909,6 +931,7 @@
color: color,
newline: newline,
indent: indent,
+ hangingIndent: hangingIndent,
);
} else {
_sendLogEvent(<String, dynamic>{'log': message});
diff --git a/packages/flutter_tools/lib/src/commands/devices.dart b/packages/flutter_tools/lib/src/commands/devices.dart
index 0613a98..78effffd 100644
--- a/packages/flutter_tools/lib/src/commands/devices.dart
+++ b/packages/flutter_tools/lib/src/commands/devices.dart
@@ -33,13 +33,13 @@
printStatus(
'No devices detected.\n\n'
"Run 'flutter emulators' to list and start any available device emulators.\n\n"
- 'Or, if you expected your device to be detected, please run "flutter doctor" to diagnose\n'
+ 'Or, if you expected your device to be detected, please run "flutter doctor" to diagnose '
'potential issues, or visit https://flutter.io/setup/ for troubleshooting tips.');
final List<String> diagnostics = await deviceManager.getDeviceDiagnostics();
if (diagnostics.isNotEmpty) {
printStatus('');
for (String diagnostic in diagnostics) {
- printStatus('• ${diagnostic.replaceAll('\n', '\n ')}');
+ printStatus('• $diagnostic', hangingIndent: 2);
}
}
} else {
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index 88daf78..2179381 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -45,23 +45,24 @@
..addFlag('keep-app-running',
defaultsTo: null,
help: 'Will keep the Flutter application running when done testing.\n'
- 'By default, "flutter drive" stops the application after tests are finished,\n'
- 'and --keep-app-running overrides this. On the other hand, if --use-existing-app\n'
- 'is specified, then "flutter drive" instead defaults to leaving the application\n'
+ 'By default, "flutter drive" stops the application after tests are finished, '
+ 'and --keep-app-running overrides this. On the other hand, if --use-existing-app '
+ 'is specified, then "flutter drive" instead defaults to leaving the application '
'running, and --no-keep-app-running overrides it.',
)
..addOption('use-existing-app',
- help: 'Connect to an already running instance via the given observatory URL.\n'
- 'If this option is given, the application will not be automatically started,\n'
+ help: 'Connect to an already running instance via the given observatory URL. '
+ 'If this option is given, the application will not be automatically started, '
'and it will only be stopped if --no-keep-app-running is explicitly set.',
valueHelp: 'url',
)
..addOption('driver',
- help: 'The test file to run on the host (as opposed to the target file to run on\n'
- 'the device). By default, this file has the same base name as the target\n'
- 'file, but in the "test_driver/" directory instead, and with "_test" inserted\n'
- 'just before the extension, so e.g. if the target is "lib/main.dart", the\n'
- 'driver will be "test_driver/main_test.dart".',
+ help: 'The test file to run on the host (as opposed to the target file to run on '
+ 'the device).\n'
+ 'By default, this file has the same base name as the target file, but in the '
+ '"test_driver/" directory instead, and with "_test" inserted just before the '
+ 'extension, so e.g. if the target is "lib/main.dart", the driver will be '
+ '"test_driver/main_test.dart".',
valueHelp: 'path',
);
}
diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart
index b7b748a..ab4a247 100644
--- a/packages/flutter_tools/lib/src/commands/packages.dart
+++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -105,10 +105,10 @@
@override
String get description {
return 'Run the "test" package.\n'
- 'This is similar to "flutter test", but instead of hosting the tests in the\n'
- 'flutter environment it hosts the tests in a pure Dart environment. The main\n'
- 'differences are that the "dart:ui" library is not available and that tests\n'
- 'run faster. This is helpful for testing libraries that do not depend on any\n'
+ 'This is similar to "flutter test", but instead of hosting the tests in the '
+ 'flutter environment it hosts the tests in a pure Dart environment. The main '
+ 'differences are that the "dart:ui" library is not available and that tests '
+ 'run faster. This is helpful for testing libraries that do not depend on any '
'packages from the Flutter SDK. It is equivalent to "pub run test".';
}
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index 160cf29..6656619 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -32,7 +32,7 @@
..addFlag('ipv6',
hide: true,
negatable: false,
- help: 'Binds to IPv6 localhost instead of IPv4 when the flutter tool\n'
+ help: 'Binds to IPv6 localhost instead of IPv4 when the flutter tool '
'forwards the host port to a device port.',
)
..addOption('route',
@@ -83,27 +83,27 @@
)
..addFlag('enable-software-rendering',
negatable: false,
- help: 'Enable rendering using the Skia software backend. This is useful\n'
- 'when testing Flutter on emulators. By default, Flutter will\n'
- 'attempt to either use OpenGL or Vulkan and fall back to software\n'
- 'when neither is available.',
+ help: 'Enable rendering using the Skia software backend. '
+ 'This is useful when testing Flutter on emulators. By default, '
+ 'Flutter will attempt to either use OpenGL or Vulkan and fall back '
+ 'to software when neither is available.',
)
..addFlag('skia-deterministic-rendering',
negatable: false,
- help: 'When combined with --enable-software-rendering, provides 100%\n'
+ help: 'When combined with --enable-software-rendering, provides 100% '
'deterministic Skia rendering.',
)
..addFlag('trace-skia',
negatable: false,
- help: 'Enable tracing of Skia code. This is useful when debugging\n'
+ help: 'Enable tracing of Skia code. This is useful when debugging '
'the GPU thread. By default, Flutter will not log skia code.',
)
..addFlag('use-test-fonts',
negatable: true,
- help: 'Enable (and default to) the "Ahem" font. This is a special font\n'
- 'used in tests to remove any dependencies on the font metrics. It\n'
- 'is enabled when you use "flutter test". Set this flag when running\n'
- 'a test using "flutter run" for debugging purposes. This flag is\n'
+ help: 'Enable (and default to) the "Ahem" font. This is a special font '
+ 'used in tests to remove any dependencies on the font metrics. It '
+ 'is enabled when you use "flutter test". Set this flag when running '
+ 'a test using "flutter run" for debugging purposes. This flag is '
'only available when running in debug mode.',
)
..addFlag('build',
@@ -116,19 +116,19 @@
)
..addOption('precompile',
hide: !verboseHelp,
- help: 'Precompile functions specified in input file. This flag is only\n'
- 'allowed when using --dynamic. It takes a Dart compilation trace\n'
- 'file produced by the training run of the application. With this\n'
- 'flag, instead of using default Dart VM snapshot provided by the\n'
- 'engine, the application will use its own snapshot that includes\n'
+ help: 'Precompile functions specified in input file. This flag is only '
+ 'allowed when using --dynamic. It takes a Dart compilation trace '
+ 'file produced by the training run of the application. With this '
+ 'flag, instead of using default Dart VM snapshot provided by the '
+ 'engine, the application will use its own snapshot that includes '
'additional functions.'
)
..addFlag('hotupdate',
hide: !verboseHelp,
- help: 'Build differential snapshot based on the last state of the build\n'
- 'tree and any changes to the application source code since then.\n'
- 'This flag is only allowed when using --dynamic. With this flag,\n'
- 'a partial VM snapshot is generated that is loaded on top of the\n'
+ help: 'Build differential snapshot based on the last state of the build '
+ 'tree and any changes to the application source code since then. '
+ 'This flag is only allowed when using --dynamic. With this flag, '
+ 'a partial VM snapshot is generated that is loaded on top of the '
'original VM snapshot that contains precompiled code.'
)
..addFlag('track-widget-creation',
@@ -142,7 +142,7 @@
..addFlag('machine',
hide: !verboseHelp,
negatable: false,
- help: 'Handle machine structured JSON command input and provide output\n'
+ help: 'Handle machine structured JSON command input and provide output '
'and progress in machine friendly format.',
)
..addFlag('hot',
@@ -151,8 +151,8 @@
help: 'Run with support for hot reloading.',
)
..addOption('pid-file',
- help: 'Specify a file to write the process id to.\n'
- 'You can send SIGUSR1 to trigger a hot reload\n'
+ help: 'Specify a file to write the process id to. '
+ 'You can send SIGUSR1 to trigger a hot reload '
'and SIGUSR2 to trigger a hot restart.',
)
..addFlag('resident',
@@ -164,9 +164,9 @@
..addFlag('benchmark',
negatable: false,
hide: !verboseHelp,
- help: 'Enable a benchmarking mode. This will run the given application,\n'
- 'measure the startup time and the app restart time, write the\n'
- 'results out to "refresh_benchmark.json", and exit. This flag is\n'
+ help: 'Enable a benchmarking mode. This will run the given application, '
+ 'measure the startup time and the app restart time, write the '
+ 'results out to "refresh_benchmark.json", and exit. This flag is '
'intended for use in generating automated flutter benchmarks.',
)
..addOption(FlutterOptions.kExtraFrontEndOptions, hide: true)
diff --git a/packages/flutter_tools/lib/src/commands/screenshot.dart b/packages/flutter_tools/lib/src/commands/screenshot.dart
index e6ae9ba..c2dc3d1 100644
--- a/packages/flutter_tools/lib/src/commands/screenshot.dart
+++ b/packages/flutter_tools/lib/src/commands/screenshot.dart
@@ -33,7 +33,7 @@
valueHelp: 'port',
help: 'The observatory port to connect to.\n'
'This is required when --$_kType is "$_kSkiaType" or "$_kRasterizerType".\n'
- 'To find the observatory port number, use "flutter run --verbose"\n'
+ 'To find the observatory port number, use "flutter run --verbose" '
'and look for "Forwarded host port ... for Observatory" in the output.',
);
argParser.addOption(
@@ -42,8 +42,8 @@
help: 'The type of screenshot to retrieve.',
allowed: const <String>[_kDeviceType, _kSkiaType, _kRasterizerType],
allowedHelp: const <String, String>{
- _kDeviceType: 'Delegate to the device\'s native screenshot capabilities. This\n'
- 'screenshots the entire screen currently being displayed (including content\n'
+ _kDeviceType: 'Delegate to the device\'s native screenshot capabilities. This '
+ 'screenshots the entire screen currently being displayed (including content '
'not rendered by Flutter, like the device status bar).',
_kSkiaType: 'Render the Flutter app as a Skia picture. Requires --$_kObservatoryPort',
_kRasterizerType: 'Render the Flutter app using the rasterizer. Requires --$_kObservatoryPort',
diff --git a/packages/flutter_tools/lib/src/commands/shell_completion.dart b/packages/flutter_tools/lib/src/commands/shell_completion.dart
index 0ef8ca5..27a65dc 100644
--- a/packages/flutter_tools/lib/src/commands/shell_completion.dart
+++ b/packages/flutter_tools/lib/src/commands/shell_completion.dart
@@ -26,9 +26,9 @@
@override
final String description = 'Output command line shell completion setup scripts.\n\n'
- 'This command prints the flutter command line completion setup script for Bash and Zsh. To\n'
- 'use it, specify an output file and follow the instructions in the generated output file to\n'
- 'install it in your shell environment. Once it is sourced, your shell will be able to\n'
+ 'This command prints the flutter command line completion setup script for Bash and Zsh. To '
+ 'use it, specify an output file and follow the instructions in the generated output file to '
+ 'install it in your shell environment. Once it is sourced, your shell will be able to '
'complete flutter commands and options.';
@override
diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart
index 978b589..b39a221 100644
--- a/packages/flutter_tools/lib/src/commands/test.dart
+++ b/packages/flutter_tools/lib/src/commands/test.dart
@@ -35,7 +35,7 @@
negatable: false,
help: 'Start in a paused mode and wait for a debugger to connect.\n'
'You must specify a single test file to run, explicitly.\n'
- 'Instructions for connecting with a debugger and printed to the\n'
+ 'Instructions for connecting with a debugger and printed to the '
'console once the test has started.',
)
..addFlag('coverage',
@@ -72,7 +72,7 @@
)
..addFlag('update-goldens',
negatable: false,
- help: 'Whether matchesGoldenFile() calls within your test methods should\n'
+ help: 'Whether matchesGoldenFile() calls within your test methods should '
'update the golden files rather than test for an existing match.',
)
..addOption('concurrency',
@@ -94,8 +94,8 @@
if (!fs.isFileSync('pubspec.yaml')) {
throwToolExit(
'Error: No pubspec.yaml file found in the current working directory.\n'
- 'Run this command from the root of your project. Test files must be\n'
- 'called *_test.dart and must reside in the package\'s \'test\'\n'
+ 'Run this command from the root of your project. Test files must be '
+ 'called *_test.dart and must reside in the package\'s \'test\' '
'directory (or one of its subdirectories).');
}
}
diff --git a/packages/flutter_tools/lib/src/commands/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart
index a714199..7956964 100644
--- a/packages/flutter_tools/lib/src/commands/trace.dart
+++ b/packages/flutter_tools/lib/src/commands/trace.dart
@@ -23,7 +23,7 @@
argParser.addFlag('stop', negatable: false, help: 'Stop tracing. Implied if --start is also omitted.');
argParser.addOption('duration',
abbr: 'd',
- help: 'Time to wait after starting (if --start is specified or implied) and before\n'
+ help: 'Time to wait after starting (if --start is specified or implied) and before '
'stopping (if --stop is specified or implied).\n'
'Defaults to ten seconds if --stop is specified or implied, zero otherwise.',
);
@@ -38,8 +38,8 @@
@override
final String usageFooter =
- '\`trace\` called without the --start or --stop flags will automatically start tracing,\n'
- 'delay a set amount of time (controlled by --duration), and stop tracing. To explicitly\n'
+ '\`trace\` called without the --start or --stop flags will automatically start tracing, '
+ 'delay a set amount of time (controlled by --duration), and stop tracing. To explicitly '
'control tracing, call trace with --start and later with --stop.\n'
'The --debug-port argument is required.';
