Skip to content

Commit b6d0912

Browse files
committed
fix format
1 parent 3cfcc48 commit b6d0912

File tree

5 files changed

+42
-19
lines changed

5 files changed

+42
-19
lines changed

modular_core/lib/src/di/bind_context.dart

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ abstract class BindContextImpl implements BindContext {
1919
@internal
2020
final Set<String> tags = {};
2121
final _singletonBinds = <Type, SingletonBind>{};
22-
List<SingletonBind> get instanciatedSingletons => _singletonBinds.values.toList();
22+
List<SingletonBind> get instanciatedSingletons =>
23+
_singletonBinds.values.toList();
2324

2425
@visibleForTesting
2526
List<BindContract> getProcessBinds() => _binds;
@@ -49,7 +50,9 @@ abstract class BindContextImpl implements BindContext {
4950
return bindValue;
5051
}
5152

52-
var bind = _binds.firstWhere((b) => b.factoryFunction is T Function(Injector), orElse: () => BindEmpty());
53+
var bind = _binds.firstWhere(
54+
(b) => b.factoryFunction is T Function(Injector),
55+
orElse: () => BindEmpty());
5356
if (bind is BindEmpty) {
5457
return null;
5558
}
@@ -109,24 +112,31 @@ abstract class BindContextImpl implements BindContext {
109112
}
110113

111114
@mustCallSuper
112-
void instantiateSingletonBinds(List<SingletonBind> singletons, Injector injector) {
113-
final filteredList = _binds.where((bind) => !bind.isLazy && !_containBind(singletons, bind));
115+
void instantiateSingletonBinds(
116+
List<SingletonBind> singletons, Injector injector) {
117+
final filteredList =
118+
_binds.where((bind) => !bind.isLazy && !_containBind(singletons, bind));
114119
for (final bindElement in filteredList) {
115120
var b = bindElement.factoryFunction(injector);
116-
_singletonBinds[b.runtimeType] = SingletonBind(value: b, bind: bindElement);
121+
_singletonBinds[b.runtimeType] =
122+
SingletonBind(value: b, bind: bindElement);
117123
}
118124
}
119125

120126
bool _containBind(List<SingletonBind> singletons, BindContract bind) {
121-
return singletons.indexWhere((element) => element.bind.factoryFunction == bind.factoryFunction) != -1;
127+
return singletons.indexWhere((element) =>
128+
element.bind.factoryFunction == bind.factoryFunction) !=
129+
-1;
122130
}
123131

124132
Type _getInjectType<B>() {
125133
var foundType = B;
126134

127135
for (var singleton in _singletonBinds.values) {
128136
if (singleton.value is B) {
129-
foundType = _singletonBinds.entries.firstWhere((map) => map.value.value == singleton.value).key;
137+
foundType = _singletonBinds.entries
138+
.firstWhere((map) => map.value.value == singleton.value)
139+
.key;
130140
break;
131141
}
132142
}

modular_core/lib/src/route/route_context.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import 'package:modular_interfaces/modular_interfaces.dart';
33

44
import '../di/bind_context.dart';
55

6-
abstract class RouteContextImpl extends BindContextImpl implements RouteContext {
6+
abstract class RouteContextImpl extends BindContextImpl
7+
implements RouteContext {
78
@override
89
List<ModularRoute> get routes => const [];
910

@@ -18,7 +19,8 @@ abstract class RouteContextImpl extends BindContextImpl implements RouteContext
1819
if (preview.name.contains('**')) {
1920
if (!actual.name.contains('**')) {
2021
return 1;
21-
} else if (actual.name.split('/').length > preview.name.split('/').length) {
22+
} else if (actual.name.split('/').length >
23+
preview.name.split('/').length) {
2224
return 1;
2325
}
2426
}
@@ -57,7 +59,9 @@ abstract class RouteContextImpl extends BindContextImpl implements RouteContext
5759
final Map<ModularKey, ModularRoute> map = {};
5860
final module = route.context!;
5961
for (var child in module.routes) {
60-
child = child.copyWith(bindContextEntries: {module.runtimeType: module}, parent: route.parent);
62+
child = child.copyWith(
63+
bindContextEntries: {module.runtimeType: module},
64+
parent: route.parent);
6165
child = copy(route, child);
6266
map.addAll(assembleRoute(child));
6367
}

modular_core/lib/src/route/tracker.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class TrackerImpl implements Tracker {
2424

2525
String get currentPath => arguments.uri.toString();
2626

27-
FutureOr<ModularRoute?> findRoute(String path, {dynamic data, String schema = ''}) async {
27+
FutureOr<ModularRoute?> findRoute(String path,
28+
{dynamic data, String schema = ''}) async {
2829
var uri = _resolverPath(path);
2930
final modularKey = ModularKey(schema: schema, name: uri.path);
3031

@@ -40,11 +41,13 @@ class TrackerImpl implements Tracker {
4041
break;
4142
}
4243
}
43-
if (uriCandidate.pathSegments.length != uri.pathSegments.length && !uriCandidate.path.contains('**')) {
44+
if (uriCandidate.pathSegments.length != uri.pathSegments.length &&
45+
!uriCandidate.path.contains('**')) {
4446
continue;
4547
}
4648

47-
if (!(uriCandidate.path.contains(':') || uriCandidate.path.contains('**'))) {
49+
if (!(uriCandidate.path.contains(':') ||
50+
uriCandidate.path.contains('**'))) {
4851
continue;
4952
}
5053

@@ -136,5 +139,6 @@ class TrackerImpl implements Tracker {
136139
}
137140

138141
class TrackerNotInitiated extends ModularError {
139-
const TrackerNotInitiated(String message, [StackTrace? stackTrace]) : super(message, stackTrace);
142+
const TrackerNotInitiated(String message, [StackTrace? stackTrace])
143+
: super(message, stackTrace);
140144
}

modular_core/test/src/di/bind_context_test.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ void main() {
102102
});
103103

104104
test('instantiateSingletonBinds', () {
105-
instance.instantiateSingletonBinds([SingletonBind(bind: _Bind((i) => 0.0), value: 0.0)], injector);
105+
instance.instantiateSingletonBinds(
106+
[SingletonBind(bind: _Bind((i) => 0.0), value: 0.0)], injector);
106107
expect(instance.instanciatedSingletons.length, 1);
107108
});
108109
}
@@ -149,11 +150,13 @@ abstract class IRepository {}
149150

150151
class Repository extends IRepository {}
151152

152-
class AsyncBind<T extends Object> extends _Bind<Future<T>> implements AsyncBindContract<T> {
153+
class AsyncBind<T extends Object> extends _Bind<Future<T>>
154+
implements AsyncBindContract<T> {
153155
@override
154156
final Future<T> Function(Injector i) asyncInject;
155157

156-
AsyncBind(this.asyncInject, {bool export = false}) : super(asyncInject, export: export);
158+
AsyncBind(this.asyncInject, {bool export = false})
159+
: super(asyncInject, export: export);
157160

158161
@override
159162
Future<T> resolveAsyncBind() async {

modular_core/test/src/route/route_context_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ void main() {
1616
});
1717

1818
test('addModule', () {
19-
var map = routeContext.assembleRoute(CustomRoute(name: '/route', context: OtherModule()));
19+
var map = routeContext
20+
.assembleRoute(CustomRoute(name: '/route', context: OtherModule()));
2021
expect(map[ModularKey(name: '/route/')]?.uri.toString(), '/first');
2122

22-
map = routeContext.assembleRoute(CustomRoute(name: '/route', context: OtherModuleWithlessSlash()));
23+
map = routeContext.assembleRoute(
24+
CustomRoute(name: '/route', context: OtherModuleWithlessSlash()));
2325
expect(map[ModularKey(name: '/route')]?.uri.toString(), isNull);
2426
expect(map[ModularKey(name: '/route/second')]?.uri.toString(), '/second');
2527
});

0 commit comments

Comments
 (0)