Replaces isNullable with isOptional.

Signed-off-by: Johyn Papin <contact@johyn.me>
google · Jul 9, 2023 · 2024979 · 2024979
1 parent 4bd55db
commit 2024979
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/protoc_plugin/lib/src/message_generator.dart b/protoc_plugin/lib/src/message_generator.dart
@@ -498,7 +498,7 @@ class MessageGenerator extends ProtobufContainer {
     final defaultExpr = field.getDefaultExpr();
     final names = field.memberNames;
 
-    if (useNullable && field.isNullable) {
+    if (useNullable && field.isOptional) {
       fieldTypeString += '?';
     }
 
@@ -511,7 +511,7 @@ class MessageGenerator extends ProtobufContainer {
         defaultExpr,
         field.isRepeated,
         field.isMapField,
-        useNullable && field.isNullable);
+        useNullable && field.isOptional);
     out.printlnAnnotated(
         '$fieldTypeString get ${names!.fieldName} => $getterExpr;', [
       NamedLocation(
@@ -539,7 +539,7 @@ class MessageGenerator extends ProtobufContainer {
       _emitOverrideIf(field.overridesSetter, out);
       _emitIndexAnnotation(field.number, out);
       if (fastSetter != null) {
-        if (useNullable && field.isNullable) {
+        if (useNullable && field.isOptional) {
           fastSetter += 'Nullable';
         }
         out.printlnAnnotated(
@@ -555,7 +555,7 @@ class MessageGenerator extends ProtobufContainer {
             ]);
       } else {
         final setterName =
-            useNullable && field.isNullable ? 'setFieldNullable' : 'setField';
+            useNullable && field.isOptional ? 'setFieldNullable' : 'setField';
 
         out.printlnAnnotated(
             'set ${names.fieldName}'

diff --git a/protoc_plugin/lib/src/protobuf_field.dart b/protoc_plugin/lib/src/protobuf_field.dart
@@ -65,6 +65,12 @@ class ProtobufField {
   bool get isRepeated =>
       descriptor.label == FieldDescriptorProto_Label.LABEL_REPEATED;
 
+  bool get isOptional {
+    if (isRepeated) return false;
+    if (isRequired || !descriptor.proto3Optional) return false;
+    return true;
+  }
+
   /// Whether a numeric field is repeated and must be encoded with packed
   /// encoding.
   ///
@@ -140,12 +146,6 @@ class ProtobufField {
     // for example in package:protobuf/src/protobuf/mixins/well_known.dart.
   }
 
-  bool get isNullable {
-    if (isRepeated) return false;
-    if (isRequired) return false;
-    return descriptor.proto3Optional || baseType.isMessage;
-  }
-
   /// Returns the expression to use for the Dart type.
   String getDartType() {
     if (isMapField) {