Skip to content

Commit 4581b84

Browse files
authored
[ffigen] Fix new use_null_aware_elements lint (dart-lang#3038)
1 parent ee71532 commit 4581b84

4 files changed

Lines changed: 11 additions & 28 deletions

File tree

‎pkgs/ffigen/lib/src/code_generator/func_type.dart‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ class FunctionType extends Type with HasLocalScope {
5454

5555
// Write Function.
5656
sb.write(' Function(');
57-
sb.write(
58-
[
59-
...params.map<String>(paramToString),
60-
if (varArgPack != null) varArgPack,
61-
].join(', '),
62-
);
57+
sb.write([...params.map<String>(paramToString), ?varArgPack].join(', '));
6358
sb.write(')');
6459

6560
return sb.toString();

‎pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class ObjCMsgSendFunc extends AstNode with HasLocalScope {
460460
Iterable<String> params, {
461461
String? structRetPtr,
462462
}) {
463-
return '''$name(${[if (structRetPtr != null) structRetPtr, target, sel, ...params].join(', ')})''';
463+
return '''$name(${[?structRetPtr, target, sel, ...params].join(', ')})''';
464464
}
465465

466466
@override

‎pkgs/ffigen/lib/src/code_generator/writer.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,7 @@ class Writer {
250250

251251
Map<String, String> _makeSymbolMapValue(Binding b) {
252252
final dartName = b is Typealias ? getTypedefDartAliasName(b) : null;
253-
return {
254-
strings.name: b.name,
255-
if (dartName != null) strings.dartName: dartName,
256-
};
253+
return {strings.name: b.name, strings.dartName: ?dartName};
257254
}
258255

259256
String? getTypedefDartAliasName(Type b) {

‎pkgs/ffigen/lib/src/config_provider/config_spec.dart‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ class HeterogeneousMapConfigSpec<CE extends Object?, RE extends Object?>
386386
'type': 'object',
387387
if (additionalProperties != AdditionalProperties.allow)
388388
'additionalProperties': false,
389-
if (schemaDescription != null) 'description': schemaDescription!,
389+
'description': ?schemaDescription,
390390
if (entries.isNotEmpty)
391391
'properties': {
392392
for (final kv in entries)
@@ -515,7 +515,7 @@ class MapConfigSpec<CE extends Object?, RE extends Object?>
515515
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
516516
return {
517517
'type': 'object',
518-
if (schemaDescription != null) 'description': schemaDescription!,
518+
'description': ?schemaDescription,
519519
if (keyValueConfigSpecs.isNotEmpty)
520520
'patternProperties': {
521521
for (final (keyRegexp: keyRegexp, valueConfigSpec: valueConfigSpec)
@@ -596,7 +596,7 @@ class ListConfigSpec<CE extends Object?, RE extends Object?>
596596
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
597597
return {
598598
'type': 'array',
599-
if (schemaDescription != null) 'description': schemaDescription!,
599+
'description': ?schemaDescription,
600600
'items': childConfigSpec._getJsonRefOrSchemaNode(defs),
601601
};
602602
}
@@ -650,7 +650,7 @@ class StringConfigSpec<RE extends Object?> extends ConfigSpec<String, RE> {
650650
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
651651
return {
652652
'type': 'string',
653-
if (schemaDescription != null) 'description': schemaDescription!,
653+
'description': ?schemaDescription,
654654
if (pattern != null) 'pattern': pattern,
655655
};
656656
}
@@ -691,10 +691,7 @@ class IntConfigSpec<RE extends Object?> extends ConfigSpec<int, RE> {
691691

692692
@override
693693
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
694-
return {
695-
'type': 'integer',
696-
if (schemaDescription != null) 'description': schemaDescription!,
697-
};
694+
return {'type': 'integer', 'description': ?schemaDescription};
698695
}
699696
}
700697

@@ -741,10 +738,7 @@ class EnumConfigSpec<CE extends Object?, RE extends Object?>
741738

742739
@override
743740
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
744-
return {
745-
'enum': allowedValues.toList(),
746-
if (schemaDescription != null) 'description': schemaDescription!,
747-
};
741+
return {'enum': allowedValues.toList(), 'description': ?schemaDescription};
748742
}
749743
}
750744

@@ -783,10 +777,7 @@ class BoolConfigSpec<RE> extends ConfigSpec<bool, RE> {
783777

784778
@override
785779
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
786-
return {
787-
'type': 'boolean',
788-
if (schemaDescription != null) 'description': schemaDescription!,
789-
};
780+
return {'type': 'boolean', 'description': ?schemaDescription};
790781
}
791782
}
792783

@@ -848,7 +839,7 @@ class OneOfConfigSpec<TE extends Object?, RE extends Object?>
848839
@override
849840
Map<String, dynamic> _generateJsonSchemaNode(Map<String, dynamic> defs) {
850841
return {
851-
if (schemaDescription != null) 'description': schemaDescription!,
842+
'description': ?schemaDescription,
852843
r'$oneOf': childConfigSpecs
853844
.map((child) => child._getJsonRefOrSchemaNode(defs))
854845
.toList(),

0 commit comments

Comments
 (0)