Skip to content

Commit 3d31aff

Browse files
tarrinnealtarrinneal
committed
better name
1 parent e350040 commit 3d31aff

File tree

3 files changed

+110
-110
lines changed

3 files changed

+110
-110
lines changed

‎packages/pigeon/lib/swift_generator.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ import FlutterMacOS
643643
void _writeNilOrType(Indent indent) {
644644
indent.format('''
645645
646-
private func nilOrType(value: Any?) -> Any? {
646+
private func nilOrValue(value: Any?) -> Any? {
647647
if (value is NSNull) {
648648
return nil
649649
}
@@ -693,7 +693,7 @@ String _castForceUnwrap(String value, TypeDeclaration type, Root root) {
693693
// Special-cased to avoid warnings about using 'as' with Any.
694694
return value;
695695
} else if (type.isNullable) {
696-
return 'nilOrType(value: $value) as! ${_swiftTypeForDartType(type)}$castUnwrap';
696+
return 'nilOrValue(value: $value) as! ${_swiftTypeForDartType(type)}$castUnwrap';
697697
} else {
698698
return '$value as! ${_swiftTypeForDartType(type)}$castUnwrap';
699699
}

‎packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private func wrapError(_ error: Any) -> [Any?] {
3535
]
3636
}
3737

38-
private func nilOrType(value: Any?) -> Any? {
38+
private func nilOrValue(value: Any?) -> Any? {
3939
if (value is NSNull) {
4040
return nil
4141
}
@@ -129,25 +129,25 @@ struct AllNullableTypes {
129129
var aNullableString: String? = nil
130130

131131
static func fromList(_ list: [Any]) -> AllNullableTypes? {
132-
let aNullableBool = nilOrType(value: list[0]) as! Bool?
133-
let aNullableInt = nilOrType(value: list[1]) as! Int64?
134-
let aNullableInt64 = nilOrType(value: list[2]) as! Int64?
135-
let aNullableDouble = nilOrType(value: list[3]) as! Double?
136-
let aNullableByteArray = nilOrType(value: list[4]) as! FlutterStandardTypedData?
137-
let aNullable4ByteArray = nilOrType(value: list[5]) as! FlutterStandardTypedData?
138-
let aNullable8ByteArray = nilOrType(value: list[6]) as! FlutterStandardTypedData?
139-
let aNullableFloatArray = nilOrType(value: list[7]) as! FlutterStandardTypedData?
140-
let aNullableList = nilOrType(value: list[8]) as! [Any]?
141-
let aNullableMap = nilOrType(value: list[9]) as! [AnyHashable: Any]?
142-
let nullableNestedList = nilOrType(value: list[10]) as! [[Bool?]?]?
143-
let nullableMapWithAnnotations = nilOrType(value: list[11]) as! [String?: String?]?
144-
let nullableMapWithObject = nilOrType(value: list[12]) as! [String?: Any?]?
132+
let aNullableBool = nilOrValue(value: list[0]) as! Bool?
133+
let aNullableInt = nilOrValue(value: list[1]) as! Int64?
134+
let aNullableInt64 = nilOrValue(value: list[2]) as! Int64?
135+
let aNullableDouble = nilOrValue(value: list[3]) as! Double?
136+
let aNullableByteArray = nilOrValue(value: list[4]) as! FlutterStandardTypedData?
137+
let aNullable4ByteArray = nilOrValue(value: list[5]) as! FlutterStandardTypedData?
138+
let aNullable8ByteArray = nilOrValue(value: list[6]) as! FlutterStandardTypedData?
139+
let aNullableFloatArray = nilOrValue(value: list[7]) as! FlutterStandardTypedData?
140+
let aNullableList = nilOrValue(value: list[8]) as! [Any]?
141+
let aNullableMap = nilOrValue(value: list[9]) as! [AnyHashable: Any]?
142+
let nullableNestedList = nilOrValue(value: list[10]) as! [[Bool?]?]?
143+
let nullableMapWithAnnotations = nilOrValue(value: list[11]) as! [String?: String?]?
144+
let nullableMapWithObject = nilOrValue(value: list[12]) as! [String?: Any?]?
145145
var aNullableEnum: AnEnum? = nil
146-
let enumVal13 = nilOrType(value: list[13]) as! Int?
146+
let enumVal13 = nilOrValue(value: list[13]) as! Int?
147147
if let aNullableEnumRawValue = enumVal13{
148148
aNullableEnum = AnEnum(rawValue: aNullableEnumRawValue)
149149
}
150-
let aNullableString = nilOrType(value: list[14]) as! String?
150+
let aNullableString = nilOrValue(value: list[14]) as! String?
151151

152152
return AllNullableTypes(
153153
aNullableBool: aNullableBool,
@@ -213,7 +213,7 @@ struct TestMessage {
213213
var testList: [Any]? = nil
214214

215215
static func fromList(_ list: [Any]) -> TestMessage? {
216-
let testList = nilOrType(value: list[0]) as! [Any]?
216+
let testList = nilOrValue(value: list[0]) as! [Any]?
217217

218218
return TestMessage(
219219
testList: testList
@@ -613,7 +613,7 @@ class HostIntegrationCoreApiSetup {
613613
if let api = api {
614614
echoAllNullableTypesChannel.setMessageHandler { message, reply in
615615
let args = message as! [Any]
616-
let everythingArg = nilOrType(value: args[0]) as! AllNullableTypes?
616+
let everythingArg = nilOrValue(value: args[0]) as! AllNullableTypes?
617617
do {
618618
let result = try api.echo(everythingArg)
619619
reply(wrapResult(result))
@@ -647,7 +647,7 @@ class HostIntegrationCoreApiSetup {
647647
if let api = api {
648648
createNestedNullableStringChannel.setMessageHandler { message, reply in
649649
let args = message as! [Any]
650-
let nullableStringArg = nilOrType(value: args[0]) as! String?
650+
let nullableStringArg = nilOrValue(value: args[0]) as! String?
651651
do {
652652
let result = try api.createNestedObject(with: nullableStringArg)
653653
reply(wrapResult(result))
@@ -663,9 +663,9 @@ class HostIntegrationCoreApiSetup {
663663
if let api = api {
664664
sendMultipleNullableTypesChannel.setMessageHandler { message, reply in
665665
let args = message as! [Any]
666-
let aNullableBoolArg = nilOrType(value: args[0]) as! Bool?
667-
let aNullableIntArg = nilOrType(value: args[1]) as! Int64?
668-
let aNullableStringArg = nilOrType(value: args[2]) as! String?
666+
let aNullableBoolArg = nilOrValue(value: args[0]) as! Bool?
667+
let aNullableIntArg = nilOrValue(value: args[1]) as! Int64?
668+
let aNullableStringArg = nilOrValue(value: args[2]) as! String?
669669
do {
670670
let result = try api.sendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg)
671671
reply(wrapResult(result))
@@ -681,7 +681,7 @@ class HostIntegrationCoreApiSetup {
681681
if let api = api {
682682
echoNullableIntChannel.setMessageHandler { message, reply in
683683
let args = message as! [Any]
684-
let aNullableIntArg = nilOrType(value: args[0]) as! Int64?
684+
let aNullableIntArg = nilOrValue(value: args[0]) as! Int64?
685685
do {
686686
let result = try api.echo(aNullableIntArg)
687687
reply(wrapResult(result))
@@ -697,7 +697,7 @@ class HostIntegrationCoreApiSetup {
697697
if let api = api {
698698
echoNullableDoubleChannel.setMessageHandler { message, reply in
699699
let args = message as! [Any]
700-
let aNullableDoubleArg = nilOrType(value: args[0]) as! Double?
700+
let aNullableDoubleArg = nilOrValue(value: args[0]) as! Double?
701701
do {
702702
let result = try api.echo(aNullableDoubleArg)
703703
reply(wrapResult(result))
@@ -713,7 +713,7 @@ class HostIntegrationCoreApiSetup {
713713
if let api = api {
714714
echoNullableBoolChannel.setMessageHandler { message, reply in
715715
let args = message as! [Any]
716-
let aNullableBoolArg = nilOrType(value: args[0]) as! Bool?
716+
let aNullableBoolArg = nilOrValue(value: args[0]) as! Bool?
717717
do {
718718
let result = try api.echo(aNullableBoolArg)
719719
reply(wrapResult(result))
@@ -729,7 +729,7 @@ class HostIntegrationCoreApiSetup {
729729
if let api = api {
730730
echoNullableStringChannel.setMessageHandler { message, reply in
731731
let args = message as! [Any]
732-
let aNullableStringArg = nilOrType(value: args[0]) as! String?
732+
let aNullableStringArg = nilOrValue(value: args[0]) as! String?
733733
do {
734734
let result = try api.echo(aNullableStringArg)
735735
reply(wrapResult(result))
@@ -745,7 +745,7 @@ class HostIntegrationCoreApiSetup {
745745
if let api = api {
746746
echoNullableUint8ListChannel.setMessageHandler { message, reply in
747747
let args = message as! [Any]
748-
let aNullableUint8ListArg = nilOrType(value: args[0]) as! FlutterStandardTypedData?
748+
let aNullableUint8ListArg = nilOrValue(value: args[0]) as! FlutterStandardTypedData?
749749
do {
750750
let result = try api.echo(aNullableUint8ListArg)
751751
reply(wrapResult(result))
@@ -777,7 +777,7 @@ class HostIntegrationCoreApiSetup {
777777
if let api = api {
778778
echoNullableListChannel.setMessageHandler { message, reply in
779779
let args = message as! [Any]
780-
let aNullableListArg = nilOrType(value: args[0]) as! [Any?]?
780+
let aNullableListArg = nilOrValue(value: args[0]) as! [Any?]?
781781
do {
782782
let result = try api.echoNullable(aNullableListArg)
783783
reply(wrapResult(result))
@@ -793,7 +793,7 @@ class HostIntegrationCoreApiSetup {
793793
if let api = api {
794794
echoNullableMapChannel.setMessageHandler { message, reply in
795795
let args = message as! [Any]
796-
let aNullableMapArg = nilOrType(value: args[0]) as! [String?: Any?]?
796+
let aNullableMapArg = nilOrValue(value: args[0]) as! [String?: Any?]?
797797
do {
798798
let result = try api.echoNullable(aNullableMapArg)
799799
reply(wrapResult(result))
@@ -1036,7 +1036,7 @@ class HostIntegrationCoreApiSetup {
10361036
if let api = api {
10371037
echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in
10381038
let args = message as! [Any]
1039-
let everythingArg = nilOrType(value: args[0]) as! AllNullableTypes?
1039+
let everythingArg = nilOrValue(value: args[0]) as! AllNullableTypes?
10401040
api.echoAsync(everythingArg) { result in
10411041
switch result {
10421042
case .success(let res):
@@ -1054,7 +1054,7 @@ class HostIntegrationCoreApiSetup {
10541054
if let api = api {
10551055
echoAsyncNullableIntChannel.setMessageHandler { message, reply in
10561056
let args = message as! [Any]
1057-
let anIntArg = nilOrType(value: args[0]) as! Int64?
1057+
let anIntArg = nilOrValue(value: args[0]) as! Int64?
10581058
api.echoAsyncNullable(anIntArg) { result in
10591059
switch result {
10601060
case .success(let res):
@@ -1072,7 +1072,7 @@ class HostIntegrationCoreApiSetup {
10721072
if let api = api {
10731073
echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in
10741074
let args = message as! [Any]
1075-
let aDoubleArg = nilOrType(value: args[0]) as! Double?
1075+
let aDoubleArg = nilOrValue(value: args[0]) as! Double?
10761076
api.echoAsyncNullable(aDoubleArg) { result in
10771077
switch result {
10781078
case .success(let res):
@@ -1090,7 +1090,7 @@ class HostIntegrationCoreApiSetup {
10901090
if let api = api {
10911091
echoAsyncNullableBoolChannel.setMessageHandler { message, reply in
10921092
let args = message as! [Any]
1093-
let aBoolArg = nilOrType(value: args[0]) as! Bool?
1093+
let aBoolArg = nilOrValue(value: args[0]) as! Bool?
10941094
api.echoAsyncNullable(aBoolArg) { result in
10951095
switch result {
10961096
case .success(let res):
@@ -1108,7 +1108,7 @@ class HostIntegrationCoreApiSetup {
11081108
if let api = api {
11091109
echoAsyncNullableStringChannel.setMessageHandler { message, reply in
11101110
let args = message as! [Any]
1111-
let aStringArg = nilOrType(value: args[0]) as! String?
1111+
let aStringArg = nilOrValue(value: args[0]) as! String?
11121112
api.echoAsyncNullable(aStringArg) { result in
11131113
switch result {
11141114
case .success(let res):
@@ -1126,7 +1126,7 @@ class HostIntegrationCoreApiSetup {
11261126
if let api = api {
11271127
echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in
11281128
let args = message as! [Any]
1129-
let aUint8ListArg = nilOrType(value: args[0]) as! FlutterStandardTypedData?
1129+
let aUint8ListArg = nilOrValue(value: args[0]) as! FlutterStandardTypedData?
11301130
api.echoAsyncNullable(aUint8ListArg) { result in
11311131
switch result {
11321132
case .success(let res):
@@ -1162,7 +1162,7 @@ class HostIntegrationCoreApiSetup {
11621162
if let api = api {
11631163
echoAsyncNullableListChannel.setMessageHandler { message, reply in
11641164
let args = message as! [Any]
1165-
let aListArg = nilOrType(value: args[0]) as! [Any?]?
1165+
let aListArg = nilOrValue(value: args[0]) as! [Any?]?
11661166
api.echoAsyncNullable(aListArg) { result in
11671167
switch result {
11681168
case .success(let res):
@@ -1180,7 +1180,7 @@ class HostIntegrationCoreApiSetup {
11801180
if let api = api {
11811181
echoAsyncNullableMapChannel.setMessageHandler { message, reply in
11821182
let args = message as! [Any]
1183-
let aMapArg = nilOrType(value: args[0]) as! [String?: Any?]?
1183+
let aMapArg = nilOrValue(value: args[0]) as! [String?: Any?]?
11841184
api.echAsyncoNullable(aMapArg) { result in
11851185
switch result {
11861186
case .success(let res):
@@ -1259,9 +1259,9 @@ class HostIntegrationCoreApiSetup {
12591259
if let api = api {
12601260
callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in
12611261
let args = message as! [Any]
1262-
let aNullableBoolArg = nilOrType(value: args[0]) as! Bool?
1263-
let aNullableIntArg = nilOrType(value: args[1]) as! Int64?
1264-
let aNullableStringArg = nilOrType(value: args[2]) as! String?
1262+
let aNullableBoolArg = nilOrValue(value: args[0]) as! Bool?
1263+
let aNullableIntArg = nilOrValue(value: args[1]) as! Int64?
1264+
let aNullableStringArg = nilOrValue(value: args[2]) as! String?
12651265
api.callFlutterSendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg) { result in
12661266
switch result {
12671267
case .success(let res):
@@ -1397,7 +1397,7 @@ class HostIntegrationCoreApiSetup {
13971397
if let api = api {
13981398
callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in
13991399
let args = message as! [Any]
1400-
let aBoolArg = nilOrType(value: args[0]) as! Bool?
1400+
let aBoolArg = nilOrValue(value: args[0]) as! Bool?
14011401
api.callFlutterEchoNullable(aBoolArg) { result in
14021402
switch result {
14031403
case .success(let res):
@@ -1414,7 +1414,7 @@ class HostIntegrationCoreApiSetup {
14141414
if let api = api {
14151415
callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in
14161416
let args = message as! [Any]
1417-
let anIntArg = nilOrType(value: args[0]) as! Int64?
1417+
let anIntArg = nilOrValue(value: args[0]) as! Int64?
14181418
api.callFlutterEchoNullable(anIntArg) { result in
14191419
switch result {
14201420
case .success(let res):
@@ -1431,7 +1431,7 @@ class HostIntegrationCoreApiSetup {
14311431
if let api = api {
14321432
callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in
14331433
let args = message as! [Any]
1434-
let aDoubleArg = nilOrType(value: args[0]) as! Double?
1434+
let aDoubleArg = nilOrValue(value: args[0]) as! Double?
14351435
api.callFlutterEchoNullable(aDoubleArg) { result in
14361436
switch result {
14371437
case .success(let res):
@@ -1448,7 +1448,7 @@ class HostIntegrationCoreApiSetup {
14481448
if let api = api {
14491449
callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in
14501450
let args = message as! [Any]
1451-
let aStringArg = nilOrType(value: args[0]) as! String?
1451+
let aStringArg = nilOrValue(value: args[0]) as! String?
14521452
api.callFlutterEchoNullable(aStringArg) { result in
14531453
switch result {
14541454
case .success(let res):
@@ -1465,7 +1465,7 @@ class HostIntegrationCoreApiSetup {
14651465
if let api = api {
14661466
callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in
14671467
let args = message as! [Any]
1468-
let aListArg = nilOrType(value: args[0]) as! FlutterStandardTypedData?
1468+
let aListArg = nilOrValue(value: args[0]) as! FlutterStandardTypedData?
14691469
api.callFlutterEchoNullable(aListArg) { result in
14701470
switch result {
14711471
case .success(let res):
@@ -1482,7 +1482,7 @@ class HostIntegrationCoreApiSetup {
14821482
if let api = api {
14831483
callFlutterEchoNullableListChannel.setMessageHandler { message, reply in
14841484
let args = message as! [Any]
1485-
let aListArg = nilOrType(value: args[0]) as! [Any?]?
1485+
let aListArg = nilOrValue(value: args[0]) as! [Any?]?
14861486
api.callFlutterEchoNullable(aListArg) { result in
14871487
switch result {
14881488
case .success(let res):
@@ -1499,7 +1499,7 @@ class HostIntegrationCoreApiSetup {
14991499
if let api = api {
15001500
callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in
15011501
let args = message as! [Any]
1502-
let aMapArg = nilOrType(value: args[0]) as! [String?: Any?]?
1502+
let aMapArg = nilOrValue(value: args[0]) as! [String?: Any?]?
15031503
api.callFlutterEchoNullable(aMapArg) { result in
15041504
switch result {
15051505
case .success(let res):
@@ -1686,55 +1686,55 @@ class FlutterIntegrationCoreApi {
16861686
func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Bool?) -> Void) {
16871687
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableBool", binaryMessenger: binaryMessenger, codec: codec)
16881688
channel.sendMessage([aBoolArg] as [Any?]) { response in
1689-
let result = nilOrType(value: response) as! Bool?
1689+
let result = nilOrValue(value: response) as! Bool?
16901690
completion(result)
16911691
}
16921692
}
16931693
/// Returns the passed int, to test serialization and deserialization.
16941694
func echoNullable(_ anIntArg: Int64?, completion: @escaping (Int64?) -> Void) {
16951695
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
16961696
channel.sendMessage([anIntArg] as [Any?]) { response in
1697-
let result = nilOrType(value: response) as! Int64?
1697+
let result = nilOrValue(value: response) as! Int64?
16981698
completion(result)
16991699
}
17001700
}
17011701
/// Returns the passed double, to test serialization and deserialization.
17021702
func echoNullable(_ aDoubleArg: Double?, completion: @escaping (Double?) -> Void) {
17031703
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableDouble", binaryMessenger: binaryMessenger, codec: codec)
17041704
channel.sendMessage([aDoubleArg] as [Any?]) { response in
1705-
let result = nilOrType(value: response) as! Double?
1705+
let result = nilOrValue(value: response) as! Double?
17061706
completion(result)
17071707
}
17081708
}
17091709
/// Returns the passed string, to test serialization and deserialization.
17101710
func echoNullable(_ aStringArg: String?, completion: @escaping (String?) -> Void) {
17111711
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableString", binaryMessenger: binaryMessenger, codec: codec)
17121712
channel.sendMessage([aStringArg] as [Any?]) { response in
1713-
let result = nilOrType(value: response) as! String?
1713+
let result = nilOrValue(value: response) as! String?
17141714
completion(result)
17151715
}
17161716
}
17171717
/// Returns the passed byte list, to test serialization and deserialization.
17181718
func echoNullable(_ aListArg: FlutterStandardTypedData?, completion: @escaping (FlutterStandardTypedData?) -> Void) {
17191719
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableUint8List", binaryMessenger: binaryMessenger, codec: codec)
17201720
channel.sendMessage([aListArg] as [Any?]) { response in
1721-
let result = nilOrType(value: response) as! FlutterStandardTypedData?
1721+
let result = nilOrValue(value: response) as! FlutterStandardTypedData?
17221722
completion(result)
17231723
}
17241724
}
17251725
/// Returns the passed list, to test serialization and deserialization.
17261726
func echoNullable(_ aListArg: [Any?]?, completion: @escaping ([Any?]?) -> Void) {
17271727
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableList", binaryMessenger: binaryMessenger, codec: codec)
17281728
channel.sendMessage([aListArg] as [Any?]) { response in
1729-
let result = nilOrType(value: response) as! [Any?]?
1729+
let result = nilOrValue(value: response) as! [Any?]?
17301730
completion(result)
17311731
}
17321732
}
17331733
/// Returns the passed map, to test serialization and deserialization.
17341734
func echoNullable(_ aMapArg: [String?: Any?]?, completion: @escaping ([String?: Any?]?) -> Void) {
17351735
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableMap", binaryMessenger: binaryMessenger, codec: codec)
17361736
channel.sendMessage([aMapArg] as [Any?]) { response in
1737-
let result = nilOrType(value: response) as! [String?: Any?]?
1737+
let result = nilOrValue(value: response) as! [String?: Any?]?
17381738
completion(result)
17391739
}
17401740
}

0 commit comments

Comments
 (0)