Refactor string utility function into extension function (#241)

pinchbv · Jan 24, 2020 · 6babe2e · 6babe2e
1 parent 0f14224
commit 6babe2e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/floor_generator/lib/misc/string_utils.dart b/floor_generator/lib/misc/string_utils.dart
@@ -1,4 +1,6 @@
-/// Makes the first letter of the supplied string [value] lowercase.
-String decapitalize(final String value) {
-  return '${value[0].toLowerCase()}${value.substring(1)}';
+extension StringUtils on String {
+  /// Makes the first letter of the supplied string [value] lowercase.
+  String decapitalize() {
+    return '${this[0].toLowerCase()}${substring(1)}';
+  }
 }
diff --git a/floor_generator/lib/writer/dao_writer.dart b/floor_generator/lib/writer/dao_writer.dart
@@ -64,7 +64,7 @@ class DaoWriter extends Writer {
           .toSet()
           .map((entity) {
         final constructor = entity.constructor;
-        final name = '_${decapitalize(entity.name)}Mapper';
+        final name = '_${entity.name.decapitalize()}Mapper';
 
         return Field((builder) => builder
           ..name = name
@@ -82,7 +82,7 @@ class DaoWriter extends Writer {
 
       for (final entity in entities) {
         final entityClassName = entity.classElement.displayName;
-        final fieldName = '_${decapitalize(entityClassName)}InsertionAdapter';
+        final fieldName = '_${entityClassName.decapitalize()}InsertionAdapter';
         final type = refer('InsertionAdapter<$entityClassName>');
 
         final field = Field((builder) => builder
@@ -110,7 +110,7 @@ class DaoWriter extends Writer {
 
       for (final entity in entities) {
         final entityClassName = entity.classElement.displayName;
-        final fieldName = '_${decapitalize(entityClassName)}UpdateAdapter';
+        final fieldName = '_${entityClassName.decapitalize()}UpdateAdapter';
         final type = refer('UpdateAdapter<$entityClassName>');
 
         final field = Field((builder) => builder
@@ -138,7 +138,7 @@ class DaoWriter extends Writer {
 
       for (final entity in entities) {
         final entityClassName = entity.classElement.displayName;
-        final fieldName = '_${decapitalize(entityClassName)}DeletionAdapter';
+        final fieldName = '_${entityClassName.decapitalize()}DeletionAdapter';
         final type = refer('DeletionAdapter<$entityClassName>');
 
         final field = Field((builder) => builder

diff --git a/floor_generator/lib/writer/deletion_method_writer.dart b/floor_generator/lib/writer/deletion_method_writer.dart
@@ -27,7 +27,7 @@ class DeletionMethodWriter implements Writer {
   @nonNull
   String _generateMethodBody() {
     final entityClassName =
-        decapitalize(_method.entity.classElement.displayName);
+        _method.entity.classElement.displayName.decapitalize();
     final methodSignatureParameterName = _method.parameterElement.name;
 
     if (_method.flattenedReturnType.isVoid) {

diff --git a/floor_generator/lib/writer/insertion_method_writer.dart b/floor_generator/lib/writer/insertion_method_writer.dart
@@ -27,7 +27,7 @@ class InsertionMethodWriter implements Writer {
   @nonNull
   String _generateMethodBody() {
     final entityClassName =
-        decapitalize(_method.entity.classElement.displayName);
+        _method.entity.classElement.displayName.decapitalize();
     final methodSignatureParameterName = _method.parameterElement.displayName;
 
     if (_method.flattenedReturnType.isVoid) {

diff --git a/floor_generator/lib/writer/query_method_writer.dart b/floor_generator/lib/writer/query_method_writer.dart
@@ -63,7 +63,7 @@ class QueryMethodWriter implements Writer {
       return _methodBody.toString();
     }
 
-    final mapper = '_${decapitalize(_queryMethod.entity.name)}Mapper';
+    final mapper = '_${_queryMethod.entity.name.decapitalize()}Mapper';
     if (_queryMethod.returnsStream) {
       _methodBody.write(_generateStreamQuery(arguments, mapper));
     } else {

diff --git a/floor_generator/lib/writer/update_method_writer.dart b/floor_generator/lib/writer/update_method_writer.dart
@@ -27,7 +27,7 @@ class UpdateMethodWriter implements Writer {
   @nonNull
   String _generateMethodBody() {
     final entityClassName =
-        decapitalize(_method.entity.classElement.displayName);
+        _method.entity.classElement.displayName.decapitalize();
     final methodSignatureParameterName = _method.parameterElement.displayName;
 
     if (_method.flattenedReturnType.isVoid) {

diff --git a/floor_generator/test/misc/string_utils_test.dart b/floor_generator/test/misc/string_utils_test.dart
@@ -5,7 +5,7 @@ void main() {
   test('decapitalize word (first letter to lowercase)', () {
     const string = 'FOO';
 
-    final actual = decapitalize(string);
+    final actual = string.decapitalize();
 
     expect(actual, 'fOO');
   });