[pigeon] removes safe casting from nullables in kotlin and swift (flu…

…tter#3284) [pigeon] removes safe casting from nullables in kotlin and swift
nploi · Jul 16, 2023 · 1ecebea · 1ecebea
1 parent e0a32f5
commit 1ecebea
Show file tree

Hide file tree

Showing 28 changed files with 117 additions and 112 deletions.
diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 9.0.2
+
+* [swift] Removes safe casting from decode process.
+* [kotlin] Removes safe casting from decode process.
+
 ## 9.0.1
 
 * Updates links for the merge of flutter/plugins into flutter/packages.

diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
@@ -11,7 +11,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '9.0.1';
+const String pigeonVersion = '9.0.2';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin_generator.dart
@@ -228,23 +228,23 @@ class KotlinGenerator extends StructuredGenerator<KotlinOptions> {
             if (!hostDatatype.isBuiltin &&
                 customClassNames.contains(field.type.baseName)) {
               indent.write('val ${field.name}: $fieldType? = ');
-              indent.add('($listValue as? List<Any?>)?.let ');
+              indent.add('($listValue as List<Any?>?)?.let ');
               indent.addScoped('{', '}', () {
                 indent.writeln('$fieldType.fromList(it)');
               });
             } else if (!hostDatatype.isBuiltin &&
                 customEnumNames.contains(field.type.baseName)) {
               indent.write('val ${field.name}: $fieldType? = ');
-              indent.add('($listValue as? Int)?.let ');
+              indent.add('($listValue as Int?)?.let ');
               indent.addScoped('{', '}', () {
                 indent.writeln('$fieldType.ofRaw(it)');
               });
             } else if (isInt) {
               indent.write('val ${field.name} = $listValue');
               indent.addln(
-                  '.let { if (it is Int) it.toLong() else it as? Long }');
+                  '.let { if (it is Int) it.toLong() else it as Long? }');
             } else {
-              indent.writeln('val ${field.name} = $listValue as? $fieldType');
+              indent.writeln('val ${field.name} = $listValue as $fieldType?');
             }
           } else {
             if (!hostDatatype.isBuiltin &&

diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart
@@ -171,7 +171,7 @@ import FlutterMacOS
     Set<String> customEnumNames,
   ) {
     final String className = klass.name;
-    indent.write('static func fromList(_ list: [Any?]) -> $className? ');
+    indent.write('static func fromList(_ list: [Any]) -> $className? ');
 
     indent.addScoped('{', '}', () {
       enumerate(getFieldsInSerializationOrder(klass),
@@ -185,27 +185,27 @@ import FlutterMacOS
           if (!hostDatatype.isBuiltin &&
               customClassNames.contains(field.type.baseName)) {
             indent.writeln('var ${field.name}: $fieldType? = nil');
-            indent.write('if let ${field.name}List = $listValue as? [Any?] ');
+            indent.write('if let ${field.name}List = $listValue as! [Any]? ');
             indent.addScoped('{', '}', () {
               indent.writeln(
-                  '${field.name} = $fieldType.fromList(${field.name}List)');
+                  '${field.name} = $fieldType.fromList(${field.name}List as [Any])');
             });
           } else if (!hostDatatype.isBuiltin &&
               customEnumNames.contains(field.type.baseName)) {
             indent.writeln('var ${field.name}: $fieldType? = nil');
-            indent.write('if let ${field.name}RawValue = $listValue as? Int ');
+            indent.write('if let ${field.name}RawValue = $listValue as! Int? ');
             indent.addScoped('{', '}', () {
               indent.writeln(
                   '${field.name} = $fieldType(rawValue: ${field.name}RawValue)');
             });
           } else {
-            indent.writeln('let ${field.name} = $listValue as? $fieldType ');
+            indent.writeln('let ${field.name} = $listValue as! $fieldType? ');
           }
         } else {
           if (!hostDatatype.isBuiltin &&
               customClassNames.contains(field.type.baseName)) {
             indent.writeln(
-                'let ${field.name} = $fieldType.fromList($listValue as! [Any?])!');
+                'let ${field.name} = $fieldType.fromList($listValue as! [Any])!');
           } else if (!hostDatatype.isBuiltin &&
               customEnumNames.contains(field.type.baseName)) {
             indent.writeln(
@@ -691,9 +691,9 @@ String _flattenTypeArguments(List<TypeDeclaration> args) {
 String _swiftTypeForBuiltinGenericDartType(TypeDeclaration type) {
   if (type.typeArguments.isEmpty) {
     if (type.baseName == 'List') {
-      return '[Any?]';
+      return '[Any]';
     } else if (type.baseName == 'Map') {
-      return '[AnyHashable: Any?]';
+      return '[AnyHashable: Any]';
     } else {
       return 'Any';
     }

diff --git a/packages/pigeon/mock_handler_tester/test/message.dart b/packages/pigeon/mock_handler_tester/test/message.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/mock_handler_tester/test/test.dart b/packages/pigeon/mock_handler_tester/test/test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import
 // ignore_for_file: avoid_relative_lib_imports

diff --git a/...st_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/...st_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.example.alternate_language_test_plugin;

diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>

diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "CoreTests.gen.h"

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/core_tests.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/flutter_unittests.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/multiple_arity.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/non_null_fields.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/null_fields.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/nullable_returns.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/lib/primitive.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

diff --git a/...atform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/...atform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // 
-// Autogenerated from Pigeon (v9.0.1), do not edit directly.
+// Autogenerated from Pigeon (v9.0.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.example.test_plugin
@@ -109,22 +109,22 @@ data class AllNullableTypes (
   companion object {
     @Suppress("UNCHECKED_CAST")
     fun fromList(list: List<Any?>): AllNullableTypes {
-      val aNullableBool = list[0] as? Boolean
-      val aNullableInt = list[1].let { if (it is Int) it.toLong() else it as? Long }
-      val aNullableDouble = list[2] as? Double
-      val aNullableByteArray = list[3] as? ByteArray
-      val aNullable4ByteArray = list[4] as? IntArray
-      val aNullable8ByteArray = list[5] as? LongArray
-      val aNullableFloatArray = list[6] as? DoubleArray
-      val aNullableList = list[7] as? List<Any?>
-      val aNullableMap = list[8] as? Map<Any, Any?>
-      val nullableNestedList = list[9] as? List<List<Boolean?>?>
-      val nullableMapWithAnnotations = list[10] as? Map<String?, String?>
-      val nullableMapWithObject = list[11] as? Map<String?, Any?>
-      val aNullableEnum: AnEnum? = (list[12] as? Int)?.let {
+      val aNullableBool = list[0] as Boolean?
+      val aNullableInt = list[1].let { if (it is Int) it.toLong() else it as Long? }
+      val aNullableDouble = list[2] as Double?
+      val aNullableByteArray = list[3] as ByteArray?
+      val aNullable4ByteArray = list[4] as IntArray?
+      val aNullable8ByteArray = list[5] as LongArray?
+      val aNullableFloatArray = list[6] as DoubleArray?
+      val aNullableList = list[7] as List<Any?>?
+      val aNullableMap = list[8] as Map<Any, Any?>?
+      val nullableNestedList = list[9] as List<List<Boolean?>?>?
+      val nullableMapWithAnnotations = list[10] as Map<String?, String?>?
+      val nullableMapWithObject = list[11] as Map<String?, Any?>?
+      val aNullableEnum: AnEnum? = (list[12] as Int?)?.let {
         AnEnum.ofRaw(it)
       }
-      val aNullableString = list[13] as? String
+      val aNullableString = list[13] as String?
       return AllNullableTypes(aNullableBool, aNullableInt, aNullableDouble, aNullableByteArray, aNullable4ByteArray, aNullable8ByteArray, aNullableFloatArray, aNullableList, aNullableMap, nullableNestedList, nullableMapWithAnnotations, nullableMapWithObject, aNullableEnum, aNullableString)
     }
   }
@@ -179,7 +179,7 @@ data class TestMessage (
   companion object {
     @Suppress("UNCHECKED_CAST")
     fun fromList(list: List<Any?>): TestMessage {
-      val testList = list[0] as? List<Any?>
+      val testList = list[0] as List<Any?>?
       return TestMessage(testList)
     }
   }

diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
@@ -37,7 +37,7 @@ class AllDatatypesTests: XCTestCase {
 
   func testAllEquals() throws {
     let everything = AllNullableTypes(
-      aNullableBool: false,
+      aNullableBool: true,
       aNullableInt: 1,
       aNullableDouble: 2.0,
       aNullableByteArray: FlutterStandardTypedData(bytes: "1234".data(using: .utf8)!),

diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/PrimitiveTests.swift
@@ -11,8 +11,8 @@ class MockPrimitiveHostApi: PrimitiveHostApi {
   func aBool(value: Bool) -> Bool { value }
   func aString(value: String) -> String { value  }
   func aDouble(value: Double) -> Double { value }
-  func aMap(value: [AnyHashable: Any?]) -> [AnyHashable: Any?] { value }
-  func aList(value: [Any?]) -> [Any?] { value }
+  func aMap(value: [AnyHashable: Any]) -> [AnyHashable: Any] { value }
+  func aList(value: [Any]) -> [Any] { value }
   func anInt32List(value: FlutterStandardTypedData) -> FlutterStandardTypedData { value }
   func aBoolList(value: [Bool?]) -> [Bool?] { value }
   func aStringIntMap(value: [String?: Int32?]) -> [String?: Int32?] { value }