Skip to content

Commit 891432c

Browse files
authored
[tool] Use kebabCase directly (#149150)
Drop silly snakeCase(..., '-') bits
1 parent 1fbcbb7 commit 891432c

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

packages/flutter_tools/lib/src/artifacts.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ class CachedArtifacts implements Artifacts {
841841
if (mode == BuildMode.debug || mode == null) {
842842
return _fileSystem.path.join(engineDir, platformName);
843843
}
844-
final String suffix = mode != BuildMode.debug ? '-${snakeCase(mode.cliName, '-')}' : '';
844+
final String suffix = mode != BuildMode.debug ? '-${kebabCase(mode.cliName)}' : '';
845845
return _fileSystem.path.join(engineDir, platformName + suffix);
846846
case TargetPlatform.fuchsia_arm64:
847847
case TargetPlatform.fuchsia_x64:
@@ -855,7 +855,7 @@ class CachedArtifacts implements Artifacts {
855855
case TargetPlatform.android_x64:
856856
case TargetPlatform.android_x86:
857857
assert(mode != null, 'Need to specify a build mode for platform $platform.');
858-
final String suffix = mode != BuildMode.debug ? '-${snakeCase(mode!.cliName, '-')}' : '';
858+
final String suffix = mode != BuildMode.debug ? '-${kebabCase(mode!.cliName)}' : '';
859859
return _fileSystem.path.join(engineDir, platformName + suffix);
860860
case TargetPlatform.android:
861861
assert(false, 'cannot use TargetPlatform.android to look up artifacts');

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,18 @@ String camelCase(String str) {
3030

3131
/// Convert `fooBar` to `foo-bar`.
3232
String kebabCase(String str) {
33-
return snakeCase(str, '-');
33+
return _reCase(str, '-');
3434
}
3535

3636
final RegExp _upperRegex = RegExp(r'[A-Z]');
3737

3838
/// Convert `fooBar` to `foo_bar`.
39-
String snakeCase(String str, [ String sep = '_' ]) {
39+
String snakeCase(String str) {
40+
return _reCase(str, '_');
41+
}
42+
43+
/// Convert `fooBar` to `foo[sep]bar`.
44+
String _reCase(String str, String sep) {
4045
return str.replaceAllMapped(_upperRegex,
4146
(Match m) => '${m.start == 0 ? '' : sep}${m[0]!.toLowerCase()}');
4247
}

packages/flutter_tools/lib/src/drive/web_driver_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ enum Browser implements CliEnum {
268268
};
269269

270270
@override
271-
String get cliName => snakeCase(name, '-');
271+
String get cliName => kebabCase(name);
272272

273273
static Browser fromCliName(String? value) => Browser.values.singleWhere(
274274
(Browser element) => element.cliName == value,

packages/flutter_tools/lib/src/web/compile.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ enum WebRendererMode implements CliEnum {
196196
}
197197

198198
@override
199-
String get cliName => snakeCase(name, '-');
199+
String get cliName => kebabCase(name);
200200

201201
@override
202202
String get helpText => switch (this) {

packages/flutter_tools/lib/src/web/file_generators/flutter_service_worker_js.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enum ServiceWorkerStrategy implements CliEnum {
1515
none;
1616

1717
@override
18-
String get cliName => snakeCase(name, '-');
18+
String get cliName => kebabCase(name);
1919

2020
static ServiceWorkerStrategy fromCliName(String? value) => value == null
2121
? ServiceWorkerStrategy.offlineFirst

0 commit comments

Comments
 (0)