better

kevmoo · May 31, 2024 · 2b717c8 · 2b717c8
1 parent f1992e3
commit 2b717c8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/build_cli/lib/src/arg_info.dart b/build_cli/lib/src/arg_info.dart
@@ -141,7 +141,7 @@ ArgType _getArgType(FieldElement element, CliOption option) {
 
   throwUnsupported(
     element,
-    '`${targetType.getDisplayString()}`'
+    '`${targetType.toStringNonNullable()}`'
     ' is not a supported type.',
   );
 }
@@ -172,8 +172,8 @@ CliOption? _getOptions(FieldElement element) {
               // field's type is `BuildTool?` it's accessors will be the
               // non-nullable type, `BuildTool`.
               // TODO: find a better way to compare the underlying type
-              p.returnType.getDisplayString() ==
-              element.type.getDisplayString(),
+              p.returnType.toStringNonNullable() ==
+              element.type.toStringNonNullable(),
         )
         .map((p) => p.name)
         .toList();
@@ -308,12 +308,12 @@ CliOption? _getOptions(FieldElement element) {
     }
 
     if (!functionElement.returnType.isAssignableTo(element.type)) {
-      final typeString = functionElement.returnType.getDisplayString();
+      final typeString = functionElement.returnType.toStringNonNullable();
       throwUnsupported(
         element,
         'The convert function `${functionElement.name}` return type '
         '`$typeString` is not compatible with the field '
-        'type `${element.type.getDisplayString()}`.',
+        'type `${element.type.toStringNonNullable()}`.',
       );
     }
     _convertName[option] = ConverterData(

diff --git a/build_cli/lib/src/build_cli_generator.dart b/build_cli/lib/src/build_cli_generator.dart
@@ -126,12 +126,12 @@ ${element.name} $resultParserName(ArgResults result) =>''',
       assert(info.optionData!.provideDefaultToOverride);
       String typeInfo;
       if (converterDataFromOptions(info.optionData!) == null) {
-        typeInfo = info.dartType.getDisplayString();
+        typeInfo = info.dartType.toStringNonNullable();
       } else {
         fyis.add(
           'The value for [${_overrideParamName(fieldName)}] must be a '
           '[String] that is convertible to '
-          '[${info.dartType.getDisplayString()}].',
+          '[${info.dartType.toStringNonNullable()}].',
         );
         typeInfo = 'String';
       }

diff --git a/build_cli/lib/src/to_share.dart b/build_cli/lib/src/to_share.dart
@@ -5,6 +5,7 @@
 // ignore_for_file: implementation_imports
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart'
     show InheritanceManager3;
 import 'package:source_gen/source_gen.dart';
@@ -201,3 +202,19 @@ Set<String> writeConstructorInvocation(
 
   return usedCtorParamsAndFields;
 }
+
+extension DartTypeExtension on DartType {
+  String toStringNonNullable() {
+    final val = getDisplayString();
+    if (val.endsWith('?')) return val.substring(0, val.length - 1);
+    return val;
+  }
+}
+
+extension ElementExtension on Element {
+  String toStringNonNullable() {
+    final val = getDisplayString();
+    if (val.endsWith('?')) return val.substring(0, val.length - 1);
+    return val;
+  }
+}