Skip to content

Commit 4aae4d7

Browse files
committed
Miscellaneous Cleanup 20241110 #2
1 parent fd0d6a9 commit 4aae4d7

File tree

4 files changed

+10
-29
lines changed

4 files changed

+10
-29
lines changed

lib/src/transformers/node_transformers/passive_text_field_transformer.dart

-2
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,6 @@ class _PassiveTextFieldWidgetState extends State<PassiveTextFieldWidget> {
504504
borderRadius: inputBorder.cornerRadius.borderRadius,
505505
borderSide: inputBorder.borderSide.toFlutter(),
506506
);
507-
default:
508-
return null;
509507
}
510508
}
511509

lib/src/transformers/utils/condition_visitors.dart

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:codelessly_api/codelessly_api.dart';
2-
import 'package:collection/collection.dart';
32

43
/// A visitor that returns the list of variable names used in a condition.
54
class ConditionVariablesVisitor
@@ -67,7 +66,7 @@ class ConditionVariablesVisitor
6766
return variablePathRegex
6867
.allMatches(part.valueString)
6968
.map((match) => match.namedGroup('name'))
70-
.whereNotNull()
69+
.nonNulls
7170
.where((element) => !excludedVariableNames.contains(element))
7271
.toSet();
7372
}
@@ -101,7 +100,7 @@ class ConditionVariablesVisitor
101100
(value) => variablePathRegex
102101
.allMatches(value.value.toString())
103102
.map((match) => match.namedGroup('name'))
104-
.whereNotNull()
103+
.nonNulls
105104
.where((element) => !excludedVariableNames.contains(element)),
106105
)
107106
.toSet();
@@ -137,7 +136,7 @@ class ConditionNodesVisitor
137136
Set<String>? visitCondition(Condition condition) => {
138137
...condition.actions
139138
.map((action) => action.accept<String>(this))
140-
.whereNotNull()
139+
.nonNulls
141140
.toSet(),
142141
};
143142

@@ -146,13 +145,13 @@ class ConditionNodesVisitor
146145
...condition.ifCondition.actions,
147146
...condition.elseIfConditions.expand((condition) => condition.actions),
148147
...condition.elseCondition?.actions ?? [],
149-
}.map((action) => action.accept<String>(this)).whereNotNull().toSet();
148+
}.map((action) => action.accept<String>(this)).nonNulls.toSet();
150149

151150
@override
152151
Set<String>? visitElseCondition(ElseCondition condition) {
153152
return condition.actions
154153
.map((action) => action.accept<String>(this))
155-
.whereNotNull()
154+
.nonNulls
156155
.toSet();
157156
}
158157

lib/src/utils/extensions.dart

+4-19
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@ extension TextOverflowHelper on TextOverflowC {
269269
return TextOverflow.ellipsis;
270270
case TextOverflowC.visible:
271271
return TextOverflow.visible;
272-
default:
273-
throw Exception('Unknown TextOverflowc value: $this');
274272
}
275273
}
276274

@@ -462,8 +460,6 @@ extension CMainAxisAlignmentHelper on MainAxisAlignmentC {
462460
return flutter.MainAxisAlignment.spaceAround;
463461
case MainAxisAlignmentC.spaceEvenly:
464462
return flutter.MainAxisAlignment.spaceEvenly;
465-
default:
466-
return flutter.MainAxisAlignment.start;
467463
}
468464
}
469465
}
@@ -481,8 +477,6 @@ extension CCrossAxisAlignmentHelper on CrossAxisAlignmentC {
481477
return flutter.CrossAxisAlignment.stretch;
482478
case CrossAxisAlignmentC.baseline:
483479
return flutter.CrossAxisAlignment.baseline;
484-
default:
485-
return flutter.CrossAxisAlignment.start;
486480
}
487481
}
488482
}
@@ -661,15 +655,12 @@ extension VariableDataListExtensions<T extends VariableData> on Iterable<T> {
661655

662656
List<String> nameToId(List<String> names) => names
663657
.map((name) => findByNameOrNull(name))
664-
.whereNotNull()
658+
.nonNulls
665659
.map((e) => e.id)
666660
.toList();
667661

668-
List<String> idToName(List<String> ids) => ids
669-
.map((id) => findByIdOrNull(id))
670-
.whereNotNull()
671-
.map((e) => e.name)
672-
.toList();
662+
List<String> idToName(List<String> ids) =>
663+
ids.map((id) => findByIdOrNull(id)).nonNulls.map((e) => e.name).toList();
673664

674665
List<String> toIds() => map((e) => e.id).toList();
675666

@@ -827,8 +818,6 @@ extension FitExtension on Fit {
827818
return BoxFit.none;
828819
case Fit.scaleDown:
829820
return BoxFit.scaleDown;
830-
default:
831-
return BoxFit.contain;
832821
}
833822
}
834823
}
@@ -1074,8 +1063,6 @@ extension BoxHeightStyleEnumExtensions on BoxHeightStyleEnum {
10741063
return BoxHeightStyle.strut;
10751064
case BoxHeightStyleEnum.tight:
10761065
return BoxHeightStyle.tight;
1077-
default:
1078-
return BoxHeightStyle.tight;
10791066
}
10801067
}
10811068
}
@@ -1087,8 +1074,6 @@ extension BoxWidthStyleEnumExtensions on BoxWidthStyleEnum {
10871074
return BoxWidthStyle.max;
10881075
case BoxWidthStyleEnum.tight:
10891076
return BoxWidthStyle.tight;
1090-
default:
1091-
return BoxWidthStyle.tight;
10921077
}
10931078
}
10941079
}
@@ -1592,7 +1577,7 @@ extension ActionModelExt on ActionModel {
15921577
strings.addAll(action.values
15931578
.map(
15941579
(value) => value.value is String ? value.value as String : null)
1595-
.whereNotNull());
1580+
.nonNulls);
15961581
case ActionType.setVariable:
15971582
final SetVariableAction action = this as SetVariableAction;
15981583
strings.addAll([action.index, action.mapKey, action.newValue]);

lib/src/utils/utils.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:cloud_firestore/cloud_firestore.dart';
22
import 'package:codelessly_api/codelessly_api.dart';
3-
import 'package:collection/collection.dart';
43
import 'package:equatable/equatable.dart';
54
import 'package:flutter/widgets.dart';
65
import 'package:http/http.dart' as http;
@@ -331,7 +330,7 @@ Set<String> getApisToLoadForCanvas(CanvasNode canvasNode) {
331330
.map((e) => e.action)
332331
.whereType<ApiCallAction>()
333332
.map((e) => e.apiId)
334-
.whereNotNull()
333+
.nonNulls
335334
.toSet();
336335
}
337336

0 commit comments

Comments
 (0)