- Fixed error in takeIf condition

Alex Babich · Alex Babich · commit 355ba2a65b42 · 2024-07-01T11:00:22.000+03:00
diff --git a/lib/src/common/functional_extender.dart b/lib/src/common/functional_extender.dart
@@ -25,7 +25,13 @@ extension FunctionalExtender<T> on T? {
   T? takeIf(bool Function(T) f) {
     final T? self = this;
 
-    return self != null && f(self) ? self : null;
+    if (self == null) return null;
+
+    if (f(self)) {
+      return self;
+    } else {
+      return null;
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,13 @@ extension FunctionalExtender<T> on T? {`
`25`	`25`	`T? takeIf(bool Function(T) f) {`
`26`	`26`	`final T? self = this;`
`27`	`27`
`28`		`- return self != null && f(self) ? self : null;`
	`28`	`+ if (self == null) return null;`
	`29`	`+`
	`30`	`+ if (f(self)) {`
	`31`	`+ return self;`
	`32`	`+ } else {`
	`33`	`+ return null;`
	`34`	`+ }`
`29`	`35`	`}`
`30`	`36`	`}`
`31`	`37`