commit 9ffbaf2c36861a725a88b9c8a340b90cc7770109
author Ömer Sinan Ağacan <omeragacan@gmail.com> Tue May 17 18:22:55 2022 +0300
committer GitHub <noreply@github.com> Tue May 17 17:22:55 2022 +0200
tree 41225e3c925a3b35204e88577d50afcb0bd7a472
parent a68bb5a2c53f0d70ca165d001cf9a5305e09fdf3

Fix default list type for frozen messages (#654)

Co-authored-by: Loren Van Spronsen <lorenvs@google.com>

protobuf/lib/src/protobuf/field_set.dart

diff --git a/protobuf/lib/src/protobuf/field_set.dart b/protobuf/lib/src/protobuf/field_set.dart
index 62d5d06..ff36282 100644
--- a/protobuf/lib/src/protobuf/field_set.dart
+++ b/protobuf/lib/src/protobuf/field_set.dart
@@ -244,7 +244,7 @@
 
   List<T> _getDefaultList<T>(FieldInfo<T> fi) {
     assert(fi.isRepeated);
-    if (_isReadOnly) return FrozenPbList._(const []);
+    if (_isReadOnly) return fi.readonlyDefault;
 
     // TODO(skybrian) we could avoid this by generating another
     // method for repeated fields:

protoc_plugin/test/repeated_field_test.dart

diff --git a/protoc_plugin/test/repeated_field_test.dart b/protoc_plugin/test/repeated_field_test.dart
index 2683745..d62ccf4 100644
--- a/protoc_plugin/test/repeated_field_test.dart
+++ b/protoc_plugin/test/repeated_field_test.dart
@@ -32,4 +32,16 @@
             .check,
         isNotNull);
   });
+
+  test('check read-only default list type', () {
+    final msg = TestAllTypes()..freeze();
+    final list = msg.repeatedInt32;
+    expect(
+      list.firstWhere(
+        (_msg) => false,
+        orElse: () => 123,
+      ),
+      123,
+    );
+  });
 }