Skip to content

Commit dc481b2

Browse files
authored
Cleanup flutter config output (#122384)
1 parent d4f884e commit dc481b2

2 files changed

Lines changed: 9 additions & 18 deletions

File tree

packages/flutter_tools/lib/src/features.dart

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,21 +239,17 @@ class Feature {
239239
if (configSetting == null) {
240240
return null;
241241
}
242-
final StringBuffer buffer = StringBuffer('Enable or disable $name. '
243-
'This setting will take effect on ');
242+
final StringBuffer buffer = StringBuffer('Enable or disable $name.');
244243
final List<String> channels = <String>[
245244
if (master.available) 'master',
246245
if (beta.available) 'beta',
247246
if (stable.available) 'stable',
248247
];
248+
// Add channel info for settings only on some channels.
249249
if (channels.length == 1) {
250-
buffer.write('the ${channels.single} channel.');
250+
buffer.write('\nThis setting applies to only the ${channels.single} channel.');
251251
} else if (channels.length == 2) {
252-
buffer.write('the ${channels.join(' and ')} channels.');
253-
} else {
254-
final String prefix = (channels.toList()
255-
..removeLast()).join(', ');
256-
buffer.write('the $prefix, and ${channels.last} channels.');
252+
buffer.write('\nThis setting applies to only the ${channels.join(' and ')} channels.');
257253
}
258254
if (extraHelpText != null) {
259255
buffer.write(' $extraHelpText');

packages/flutter_tools/test/general.shard/features_test.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,22 @@ void main() {
8989

9090
testWithoutContext('Flutter web help string', () {
9191
expect(flutterWebFeature.generateHelpMessage(),
92-
'Enable or disable Flutter for web. '
93-
'This setting will take effect on the master, beta, and stable channels.');
92+
'Enable or disable Flutter for web.');
9493
});
9594

9695
testWithoutContext('Flutter macOS desktop help string', () {
9796
expect(flutterMacOSDesktopFeature.generateHelpMessage(),
98-
'Enable or disable support for desktop on macOS. '
99-
'This setting will take effect on the master, beta, and stable channels.');
97+
'Enable or disable support for desktop on macOS.');
10098
});
10199

102100
testWithoutContext('Flutter Linux desktop help string', () {
103101
expect(flutterLinuxDesktopFeature.generateHelpMessage(),
104-
'Enable or disable support for desktop on Linux. '
105-
'This setting will take effect on the master, beta, and stable channels.');
102+
'Enable or disable support for desktop on Linux.');
106103
});
107104

108105
testWithoutContext('Flutter Windows desktop help string', () {
109106
expect(flutterWindowsDesktopFeature.generateHelpMessage(),
110-
'Enable or disable support for desktop on Windows. '
111-
'This setting will take effect on the master, beta, and stable channels.');
107+
'Enable or disable support for desktop on Windows.');
112108
});
113109

114110
testWithoutContext('help string on multiple channels', () {
@@ -120,8 +116,7 @@ void main() {
120116
configSetting: 'foo',
121117
);
122118

123-
expect(testWithoutContextFeature.generateHelpMessage(), 'Enable or disable example. '
124-
'This setting will take effect on the master, beta, and stable channels.');
119+
expect(testWithoutContextFeature.generateHelpMessage(), 'Enable or disable example.');
125120
});
126121

127122
/// Flutter Web

0 commit comments

Comments
 (0)