[pigeon] Fixes swift int64 support for Swift (#3455)

[pigeon] Fixes swift int64 support for Swift

Author: tarrinneal

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 9.0.7
+
+* [swift] Changes all ints to int64.
+  May require code updates to existing code.
+* Adds integration tests for int64.
+
 ## 9.0.6
 
 * [kotlin] Removes safe casting from decode process.

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.6';
+const String pigeonVersion = '9.0.7';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

packages/pigeon/lib/swift_generator.dart

@@ -669,15 +669,17 @@ String _camelCase(String text) {
 
 String _castForceUnwrap(String value, TypeDeclaration type, Root root) {
   final String forceUnwrap = type.isNullable ? '' : '!';
+  final String castUnwrap = type.isNullable ? '?' : '';
   if (isEnum(root, type)) {
     final String nullableConditionPrefix =
         type.isNullable ? '$value == nil ? nil : ' : '';
     return '$nullableConditionPrefix${_swiftTypeForDartType(type)}(rawValue: $value as! Int)$forceUnwrap';
   } else if (type.baseName == 'Object') {
     // Special-cased to avoid warnings about using 'as' with Any.
     return value;
+  } else if (type.baseName == 'int') {
+    return '($value is Int) ? Int64($value as! Int) : $value as! Int64$castUnwrap';
   } else {
-    final String castUnwrap = type.isNullable ? '?' : '';
     return '$value as! ${_swiftTypeForDartType(type)}$castUnwrap';
   }
 }
@@ -713,7 +715,7 @@ String? _swiftTypeForBuiltinDartType(TypeDeclaration type) {
     'void': 'Void',
     'bool': 'Bool',
     'String': 'String',
-    'int': 'Int32',
+    'int': 'Int64',
     'double': 'Double',
     'Uint8List': 'FlutterStandardTypedData',
     'Int32List': 'FlutterStandardTypedData',

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.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), 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
 

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.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), 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

packages/pigeon/pigeons/core_tests.dart

@@ -15,6 +15,7 @@ class AllTypes {
   AllTypes({
     this.aBool = false,
     this.anInt = 0,
+    this.anInt64 = 0,
     this.aDouble = 0,
     required this.aByteArray,
     required this.a4ByteArray,
@@ -28,6 +29,7 @@ class AllTypes {
 
   bool aBool;
   int anInt;
+  int anInt64;
   double aDouble;
   Uint8List aByteArray;
   Int32List a4ByteArray;
@@ -46,6 +48,7 @@ class AllNullableTypes {
   AllNullableTypes(
     this.aNullableBool,
     this.aNullableInt,
+    this.aNullableInt64,
     this.aNullableDouble,
     this.aNullableByteArray,
     this.aNullable4ByteArray,
@@ -62,6 +65,7 @@ class AllNullableTypes {
 
   bool? aNullableBool;
   int? aNullableInt;
+  int? aNullableInt64;
   double? aNullableDouble;
   Uint8List? aNullableByteArray;
   Int32List? aNullable4ByteArray;

packages/pigeon/platform_tests/alternate_language_test_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.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.example.alternate_language_test_plugin;
@@ -75,6 +75,19 @@ public void setAnInt(@NonNull Long setterArg) {
       this.anInt = setterArg;
     }
 
+    private @NonNull Long anInt64;
+
+    public @NonNull Long getAnInt64() {
+      return anInt64;
+    }
+
+    public void setAnInt64(@NonNull Long setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"anInt64\" is null.");
+      }
+      this.anInt64 = setterArg;
+    }
+
     private @NonNull Double aDouble;
 
     public @NonNull Double getADouble() {
@@ -211,6 +224,13 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Long anInt64;
+
+      public @NonNull Builder setAnInt64(@NonNull Long setterArg) {
+        this.anInt64 = setterArg;
+        return this;
+      }
+
       private @Nullable Double aDouble;
 
       public @NonNull Builder setADouble(@NonNull Double setterArg) {
@@ -278,6 +298,7 @@ public static final class Builder {
         AllTypes pigeonReturn = new AllTypes();
         pigeonReturn.setABool(aBool);
         pigeonReturn.setAnInt(anInt);
+        pigeonReturn.setAnInt64(anInt64);
         pigeonReturn.setADouble(aDouble);
         pigeonReturn.setAByteArray(aByteArray);
         pigeonReturn.setA4ByteArray(a4ByteArray);
@@ -293,9 +314,10 @@ public static final class Builder {
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(11);
+      ArrayList<Object> toListResult = new ArrayList<Object>(12);
       toListResult.add(aBool);
       toListResult.add(anInt);
+      toListResult.add(anInt64);
       toListResult.add(aDouble);
       toListResult.add(aByteArray);
       toListResult.add(a4ByteArray);
@@ -315,23 +337,28 @@ ArrayList<Object> toList() {
       Object anInt = list.get(1);
       pigeonResult.setAnInt(
           (anInt == null) ? null : ((anInt instanceof Integer) ? (Integer) anInt : (Long) anInt));
-      Object aDouble = list.get(2);
+      Object anInt64 = list.get(2);
+      pigeonResult.setAnInt64(
+          (anInt64 == null)
+              ? null
+              : ((anInt64 instanceof Integer) ? (Integer) anInt64 : (Long) anInt64));
+      Object aDouble = list.get(3);
       pigeonResult.setADouble((Double) aDouble);
-      Object aByteArray = list.get(3);
+      Object aByteArray = list.get(4);
       pigeonResult.setAByteArray((byte[]) aByteArray);
-      Object a4ByteArray = list.get(4);
+      Object a4ByteArray = list.get(5);
       pigeonResult.setA4ByteArray((int[]) a4ByteArray);
-      Object a8ByteArray = list.get(5);
+      Object a8ByteArray = list.get(6);
       pigeonResult.setA8ByteArray((long[]) a8ByteArray);
-      Object aFloatArray = list.get(6);
+      Object aFloatArray = list.get(7);
       pigeonResult.setAFloatArray((double[]) aFloatArray);
-      Object aList = list.get(7);
+      Object aList = list.get(8);
       pigeonResult.setAList((List<Object>) aList);
-      Object aMap = list.get(8);
+      Object aMap = list.get(9);
       pigeonResult.setAMap((Map<Object, Object>) aMap);
-      Object anEnum = list.get(9);
+      Object anEnum = list.get(10);
       pigeonResult.setAnEnum(anEnum == null ? null : AnEnum.values()[(int) anEnum]);
-      Object aString = list.get(10);
+      Object aString = list.get(11);
       pigeonResult.setAString((String) aString);
       return pigeonResult;
     }
@@ -359,6 +386,16 @@ public void setANullableInt(@Nullable Long setterArg) {
       this.aNullableInt = setterArg;
     }
 
+    private @Nullable Long aNullableInt64;
+
+    public @Nullable Long getANullableInt64() {
+      return aNullableInt64;
+    }
+
+    public void setANullableInt64(@Nullable Long setterArg) {
+      this.aNullableInt64 = setterArg;
+    }
+
     private @Nullable Double aNullableDouble;
 
     public @Nullable Double getANullableDouble() {
@@ -495,6 +532,13 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable Long aNullableInt64;
+
+      public @NonNull Builder setANullableInt64(@Nullable Long setterArg) {
+        this.aNullableInt64 = setterArg;
+        return this;
+      }
+
       private @Nullable Double aNullableDouble;
 
       public @NonNull Builder setANullableDouble(@Nullable Double setterArg) {
@@ -584,6 +628,7 @@ public static final class Builder {
         AllNullableTypes pigeonReturn = new AllNullableTypes();
         pigeonReturn.setANullableBool(aNullableBool);
         pigeonReturn.setANullableInt(aNullableInt);
+        pigeonReturn.setANullableInt64(aNullableInt64);
         pigeonReturn.setANullableDouble(aNullableDouble);
         pigeonReturn.setANullableByteArray(aNullableByteArray);
         pigeonReturn.setANullable4ByteArray(aNullable4ByteArray);
@@ -602,9 +647,10 @@ public static final class Builder {
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(14);
+      ArrayList<Object> toListResult = new ArrayList<Object>(15);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
+      toListResult.add(aNullableInt64);
       toListResult.add(aNullableDouble);
       toListResult.add(aNullableByteArray);
       toListResult.add(aNullable4ByteArray);
@@ -629,30 +675,37 @@ ArrayList<Object> toList() {
           (aNullableInt == null)
               ? null
               : ((aNullableInt instanceof Integer) ? (Integer) aNullableInt : (Long) aNullableInt));
-      Object aNullableDouble = list.get(2);
+      Object aNullableInt64 = list.get(2);
+      pigeonResult.setANullableInt64(
+          (aNullableInt64 == null)
+              ? null
+              : ((aNullableInt64 instanceof Integer)
+                  ? (Integer) aNullableInt64
+                  : (Long) aNullableInt64));
+      Object aNullableDouble = list.get(3);
       pigeonResult.setANullableDouble((Double) aNullableDouble);
-      Object aNullableByteArray = list.get(3);
+      Object aNullableByteArray = list.get(4);
       pigeonResult.setANullableByteArray((byte[]) aNullableByteArray);
-      Object aNullable4ByteArray = list.get(4);
+      Object aNullable4ByteArray = list.get(5);
       pigeonResult.setANullable4ByteArray((int[]) aNullable4ByteArray);
-      Object aNullable8ByteArray = list.get(5);
+      Object aNullable8ByteArray = list.get(6);
       pigeonResult.setANullable8ByteArray((long[]) aNullable8ByteArray);
-      Object aNullableFloatArray = list.get(6);
+      Object aNullableFloatArray = list.get(7);
       pigeonResult.setANullableFloatArray((double[]) aNullableFloatArray);
-      Object aNullableList = list.get(7);
+      Object aNullableList = list.get(8);
       pigeonResult.setANullableList((List<Object>) aNullableList);
-      Object aNullableMap = list.get(8);
+      Object aNullableMap = list.get(9);
       pigeonResult.setANullableMap((Map<Object, Object>) aNullableMap);
-      Object nullableNestedList = list.get(9);
+      Object nullableNestedList = list.get(10);
       pigeonResult.setNullableNestedList((List<List<Boolean>>) nullableNestedList);
-      Object nullableMapWithAnnotations = list.get(10);
+      Object nullableMapWithAnnotations = list.get(11);
       pigeonResult.setNullableMapWithAnnotations((Map<String, String>) nullableMapWithAnnotations);
-      Object nullableMapWithObject = list.get(11);
+      Object nullableMapWithObject = list.get(12);
       pigeonResult.setNullableMapWithObject((Map<String, Object>) nullableMapWithObject);
-      Object aNullableEnum = list.get(12);
+      Object aNullableEnum = list.get(13);
       pigeonResult.setANullableEnum(
           aNullableEnum == null ? null : AnEnum.values()[(int) aNullableEnum]);
-      Object aNullableString = list.get(13);
+      Object aNullableString = list.get(14);
       pigeonResult.setANullableString((String) aNullableString);
       return pigeonResult;
     }

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.6), do not edit directly.
+// Autogenerated from Pigeon (v9.0.7), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
@@ -30,6 +30,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)makeWithABool:(NSNumber *)aBool
                         anInt:(NSNumber *)anInt
+                      anInt64:(NSNumber *)anInt64
                       aDouble:(NSNumber *)aDouble
                    aByteArray:(FlutterStandardTypedData *)aByteArray
                   a4ByteArray:(FlutterStandardTypedData *)a4ByteArray
@@ -41,6 +42,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                       aString:(NSString *)aString;
 @property(nonatomic, strong) NSNumber *aBool;
 @property(nonatomic, strong) NSNumber *anInt;
+@property(nonatomic, strong) NSNumber *anInt64;
 @property(nonatomic, strong) NSNumber *aDouble;
 @property(nonatomic, strong) FlutterStandardTypedData *aByteArray;
 @property(nonatomic, strong) FlutterStandardTypedData *a4ByteArray;
@@ -55,6 +57,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 @interface AllNullableTypes : NSObject
 + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
                          aNullableInt:(nullable NSNumber *)aNullableInt
+                       aNullableInt64:(nullable NSNumber *)aNullableInt64
                       aNullableDouble:(nullable NSNumber *)aNullableDouble
                    aNullableByteArray:(nullable FlutterStandardTypedData *)aNullableByteArray
                   aNullable4ByteArray:(nullable FlutterStandardTypedData *)aNullable4ByteArray
@@ -70,6 +73,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                       aNullableString:(nullable NSString *)aNullableString;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
+@property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
 @property(nonatomic, strong, nullable) NSNumber *aNullableDouble;
 @property(nonatomic, strong, nullable) FlutterStandardTypedData *aNullableByteArray;
 @property(nonatomic, strong, nullable) FlutterStandardTypedData *aNullable4ByteArray;