Skip to content

[pigeon] removes safe casting from nullables in kotlin and swift #3284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 7 commits into from
Feb 28, 2023
Merged

[pigeon] removes safe casting from nullables in kotlin and swift #3284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f893d7
fails with bool? only
tarrinneal Feb 21, 2023
4331ba1
change most instances of [Any?] to [Any]
tarrinneal Feb 22, 2023
2772e95
kotlin, changelog, generate, format
tarrinneal Feb 23, 2023
a6fe0b3
Merge branch 'main' into unsafe
tarrinneal Feb 23, 2023
1ac0aee
gen
tarrinneal Feb 23, 2023
8d4cba5
remove Any? from maps
tarrinneal Feb 24, 2023
307128f
?
tarrinneal Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
?
  • Loading branch information
@tarrinneal
tarrinneal committed Feb 28, 2023
commit 307128f412c7af977cfeaddc83292ec33c897ed8
2 changes: 1 addition & 1 deletion packages/pigeon/lib/kotlin_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ 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)');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/pigeon/lib/swift_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ 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 as [Any])');
Expand Down
2 changes: 1 addition & 1 deletion packages/pigeon/test/kotlin_generator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ void main() {
expect(code, contains('val nested: Nested? = null'));
expect(code, contains('fun fromList(list: List<Any?>): Outer'));
expect(
code, contains('val nested: Nested? = (list[0] as List<Any?>)?.let'));
code, contains('val nested: Nested? = (list[0] as List<Any?>?)?.let'));
expect(code, contains('Nested.fromList(it)'));
expect(code, contains('fun toList(): List<Any?>'));
});
Expand Down