Skip to content

Commit d695482

Browse files
jacob314jacob314
authored
Fixes from code metrics lints (flutter#4890)
1 parent 5e17f95 commit d695482

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+220
-341
lines changed

‎packages/devtools_app/lib/src/screens/app_size/app_size_controller.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,16 +695,14 @@ class AppSizeController {
695695
}
696696

697697
// If none of the children matched the diff tree type
698-
if (totalByteSize == 0 && skipNodesWithNoByteSizeChange) {
699-
return null;
700-
} else {
701-
return _buildNode(
702-
treeJson,
703-
totalByteSize,
704-
children: treemapNodeChildren,
705-
showDiff: showDiff,
706-
);
707-
}
698+
return totalByteSize == 0 && skipNodesWithNoByteSizeChange
699+
? null
700+
: _buildNode(
701+
treeJson,
702+
totalByteSize,
703+
children: treemapNodeChildren,
704+
showDiff: showDiff,
705+
);
708706
}
709707

710708
TreemapNode _buildNode(

‎packages/devtools_app/lib/src/screens/app_size/app_size_table.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,7 @@ class _DiffColumn extends ColumnData<TreemapNode> {
238238

239239
@override
240240
Color getTextColor(TreemapNode dataObject) {
241-
if (dataObject.byteSize < 0) {
242-
return tableDecreaseColor;
243-
} else {
244-
return tableIncreaseColor;
245-
}
241+
return dataObject.byteSize < 0 ? tableDecreaseColor : tableIncreaseColor;
246242
}
247243
}
248244

‎packages/devtools_app/lib/src/screens/debugger/call_stack.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,15 @@ class _CallStackState extends State<CallStack>
112112
),
113113
);
114114

115-
if (isAsyncBreak) {
116-
return result;
117-
} else {
118-
return DevToolsTooltip(
119-
message: locationDescription == null
120-
? frameDescription
121-
: '$frameDescription $locationDescription',
122-
waitDuration: tooltipWaitLong,
123-
child: result,
124-
);
125-
}
115+
return isAsyncBreak
116+
? result
117+
: DevToolsTooltip(
118+
message: locationDescription == null
119+
? frameDescription
120+
: '$frameDescription $locationDescription',
121+
waitDuration: tooltipWaitLong,
122+
child: result,
123+
);
126124
}
127125

128126
Future<void> _onStackFrameSelected(StackFrameAndSourcePosition frame) async {

‎packages/devtools_app/lib/src/screens/debugger/debugger_controller.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -634,11 +634,8 @@ class DebuggerController extends DisposableController
634634
void selectStackFrame(StackFrameAndSourcePosition? frame) {
635635
_selectedStackFrame.value = frame;
636636

637-
if (frame != null) {
638-
_variables.value = _createVariablesForFrame(frame.frame);
639-
} else {
640-
_variables.value = [];
641-
}
637+
_variables.value =
638+
frame != null ? _createVariablesForFrame(frame.frame) : [];
642639

643640
final scriptRef = frame?.scriptRef;
644641
final position = frame?.position;

‎packages/devtools_app/lib/src/screens/debugger/debugger_model.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,11 @@ class ScriptRefUtils {
437437
];
438438
}
439439

440-
if (parts.length > 1) {
441-
return [
442-
parts.first,
443-
parts.sublist(1).join('/'),
444-
];
445-
} else {
446-
return parts;
447-
}
440+
return parts.length > 1
441+
? [
442+
parts.first,
443+
parts.sublist(1).join('/'),
444+
]
445+
: parts;
448446
}
449447
}

‎packages/devtools_app/lib/src/screens/inspector/diagnostics.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class DiagnosticsNodeDescription extends StatelessWidget {
134134
}
135135
}
136136

137-
if (description.isNotEmpty == true) {
137+
if (description.isNotEmpty) {
138138
yield TextSpan(text: description, style: textStyle);
139139
}
140140

@@ -295,12 +295,9 @@ class DiagnosticsNodeDescription extends StatelessWidget {
295295
final int green = JsonUtils.getIntMember(properties, 'green');
296296
final int blue = JsonUtils.getIntMember(properties, 'blue');
297297
String radix(int chan) => chan.toRadixString(16).padLeft(2, '0');
298-
if (alpha == 255) {
299-
description = '#${radix(red)}${radix(green)}${radix(blue)}';
300-
} else {
301-
description =
302-
'#${radix(alpha)}${radix(red)}${radix(green)}${radix(blue)}';
303-
}
298+
description = alpha == 255
299+
? '#${radix(red)}${radix(green)}${radix(blue)}'
300+
: '#${radix(alpha)}${radix(red)}${radix(green)}${radix(blue)}';
304301

305302
final Color color = Color.fromARGB(alpha, red, green, blue);
306303
children.add(_paddedIcon(_colorIconMaker.getCustomIcon(color)));

‎packages/devtools_app/lib/src/screens/inspector/inspector_breadcrumbs.dart

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,16 @@ class InspectorBreadcrumbNavigator extends StatelessWidget {
6868
);
6969
}).toList();
7070
List<_InspectorBreadcrumbData> breadcrumbs;
71-
if (items.length > _maxNumberOfBreadcrumbs) {
72-
breadcrumbs = [
73-
items[0],
74-
_InspectorBreadcrumbData.more(),
75-
...items.sublist(
76-
items.length - _maxNumberOfBreadcrumbs + 1,
77-
items.length,
78-
),
79-
];
80-
} else {
81-
breadcrumbs = items;
82-
}
71+
breadcrumbs = items.length > _maxNumberOfBreadcrumbs
72+
? [
73+
items[0],
74+
_InspectorBreadcrumbData.more(),
75+
...items.sublist(
76+
items.length - _maxNumberOfBreadcrumbs + 1,
77+
items.length,
78+
)
79+
]
80+
: items;
8381

8482
return breadcrumbs.joinWith(_InspectorBreadcrumbData.chevron());
8583
}

‎packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,14 @@ class InspectorController extends DisposableController
6565
onExpand: _onExpand,
6666
onClientActiveChange: _onClientChange,
6767
);
68-
if (isSummaryTree) {
69-
details = InspectorController(
70-
inspectorTree: detailsTree!,
71-
treeType: treeType,
72-
parent: this,
73-
isSummaryTree: false,
74-
);
75-
} else {
76-
details = null;
77-
}
68+
details = isSummaryTree
69+
? InspectorController(
70+
inspectorTree: detailsTree!,
71+
treeType: treeType,
72+
parent: this,
73+
isSummaryTree: false,
74+
)
75+
: null;
7876

7977
await serviceManager.onServiceAvailable;
8078

@@ -807,7 +805,7 @@ class InspectorController extends DisposableController
807805
}
808806

809807
void selectionChanged() {
810-
if (visibleToUser == false) {
808+
if (!visibleToUser) {
811809
return;
812810
}
813811

‎packages/devtools_app/lib/src/screens/inspector/inspector_screen_details_tab.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class InspectorExpandCollapseButtons extends StatefulWidget {
7171

7272
class _InspectorExpandCollapseButtonsState
7373
extends State<InspectorExpandCollapseButtons> with BlockingActionMixin {
74-
bool get enableButtons => actionInProgress == false;
74+
bool get enableButtons => !actionInProgress;
7575

7676
@override
7777
Widget build(BuildContext context) {

‎packages/devtools_app/lib/src/screens/inspector/inspector_service.dart

Lines changed: 54 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,11 @@ abstract class InspectorServiceBase extends DisposableController
122122
}
123123

124124
Future<bool> invokeBoolServiceMethodNoArgs(String methodName) async {
125-
if (useDaemonApi) {
126-
return await invokeServiceMethodDaemonNoGroupArgs(methodName) == true;
127-
} else {
128-
return (await invokeServiceMethodObservatoryNoGroup(methodName))
129-
?.valueAsString ==
130-
'true';
131-
}
125+
return useDaemonApi
126+
? await invokeServiceMethodDaemonNoGroupArgs(methodName) == true
127+
: (await invokeServiceMethodObservatoryNoGroup(methodName))
128+
?.valueAsString ==
129+
'true';
132130
}
133131

134132
Future<Object?> invokeServiceMethodDaemonNoGroupArgs(
@@ -638,45 +636,39 @@ abstract class ObjectGroupBase implements Disposable {
638636
String methodName,
639637
) async {
640638
if (disposed) return null;
641-
if (useDaemonApi) {
642-
return parseDiagnosticsNodeDaemon(invokeServiceMethodDaemon(methodName));
643-
} else {
644-
return parseDiagnosticsNodeObservatory(
645-
invokeServiceMethodObservatory(methodName),
646-
);
647-
}
639+
return useDaemonApi
640+
? parseDiagnosticsNodeDaemon(invokeServiceMethodDaemon(methodName))
641+
: parseDiagnosticsNodeObservatory(
642+
invokeServiceMethodObservatory(methodName),
643+
);
648644
}
649645

650646
Future<RemoteDiagnosticsNode?> invokeServiceMethodReturningNodeInspectorRef(
651647
String methodName,
652648
InspectorInstanceRef? ref,
653649
) async {
654650
if (disposed) return null;
655-
if (useDaemonApi) {
656-
return parseDiagnosticsNodeDaemon(
657-
invokeServiceMethodDaemonInspectorRef(methodName, ref),
658-
);
659-
} else {
660-
return parseDiagnosticsNodeObservatory(
661-
invokeServiceMethodObservatoryInspectorRef(methodName, ref),
662-
);
663-
}
651+
return useDaemonApi
652+
? parseDiagnosticsNodeDaemon(
653+
invokeServiceMethodDaemonInspectorRef(methodName, ref),
654+
)
655+
: parseDiagnosticsNodeObservatory(
656+
invokeServiceMethodObservatoryInspectorRef(methodName, ref),
657+
);
664658
}
665659

666660
Future<RemoteDiagnosticsNode?> invokeServiceMethodWithArgReturningNode(
667661
String methodName,
668662
String arg,
669663
) async {
670664
if (disposed) return null;
671-
if (useDaemonApi) {
672-
return parseDiagnosticsNodeDaemon(
673-
invokeServiceMethodDaemonArg(methodName, arg, groupName),
674-
);
675-
} else {
676-
return parseDiagnosticsNodeObservatory(
677-
invokeServiceMethodObservatoryWithGroupName1(methodName, arg),
678-
);
679-
}
665+
return useDaemonApi
666+
? parseDiagnosticsNodeDaemon(
667+
invokeServiceMethodDaemonArg(methodName, arg, groupName),
668+
)
669+
: parseDiagnosticsNodeObservatory(
670+
invokeServiceMethodObservatoryWithGroupName1(methodName, arg),
671+
);
680672
}
681673

682674
Future<void> invokeVoidServiceMethodInspectorRef(
@@ -1049,19 +1041,17 @@ abstract class ObjectGroupBase implements Disposable {
10491041
bool isProperty,
10501042
) async {
10511043
if (disposed) return const [];
1052-
if (useDaemonApi) {
1053-
return parseDiagnosticsNodesDaemon(
1054-
invokeServiceMethodDaemonInspectorRef(methodName, instanceRef),
1055-
parent,
1056-
isProperty,
1057-
);
1058-
} else {
1059-
return parseDiagnosticsNodesObservatory(
1060-
invokeServiceMethodObservatoryInspectorRef(methodName, instanceRef),
1061-
parent,
1062-
isProperty,
1063-
);
1064-
}
1044+
return useDaemonApi
1045+
? parseDiagnosticsNodesDaemon(
1046+
invokeServiceMethodDaemonInspectorRef(methodName, instanceRef),
1047+
parent,
1048+
isProperty,
1049+
)
1050+
: parseDiagnosticsNodesObservatory(
1051+
invokeServiceMethodObservatoryInspectorRef(methodName, instanceRef),
1052+
parent,
1053+
isProperty,
1054+
);
10651055
}
10661056

10671057
/// Evaluate an expression where `object` references the [inspectorRef] or
@@ -1246,12 +1236,10 @@ class ObjectGroup extends ObjectGroupBase {
12461236
}
12471237
if (disposed) return null;
12481238

1249-
if (newSelection != null &&
1250-
newSelection.dartDiagnosticRef == previousSelectionRef) {
1251-
return previousSelection;
1252-
} else {
1253-
return newSelection;
1254-
}
1239+
return newSelection != null &&
1240+
newSelection.dartDiagnosticRef == previousSelectionRef
1241+
? previousSelection
1242+
: newSelection;
12551243
}
12561244

12571245
Future<bool> setSelectionInspector(
@@ -1264,20 +1252,21 @@ class ObjectGroup extends ObjectGroupBase {
12641252
if (uiAlreadyUpdated) {
12651253
inspectorService._trackClientSelfTriggeredSelection(selection);
12661254
}
1267-
if (useDaemonApi) {
1268-
return handleSetSelectionDaemon(
1269-
invokeServiceMethodDaemonInspectorRef('setSelectionById', selection),
1270-
uiAlreadyUpdated,
1271-
);
1272-
} else {
1273-
return handleSetSelectionObservatory(
1274-
invokeServiceMethodObservatoryInspectorRef(
1275-
'setSelectionById',
1276-
selection,
1277-
),
1278-
uiAlreadyUpdated,
1279-
);
1280-
}
1255+
return useDaemonApi
1256+
? handleSetSelectionDaemon(
1257+
invokeServiceMethodDaemonInspectorRef(
1258+
'setSelectionById',
1259+
selection,
1260+
),
1261+
uiAlreadyUpdated,
1262+
)
1263+
: handleSetSelectionObservatory(
1264+
invokeServiceMethodObservatoryInspectorRef(
1265+
'setSelectionById',
1266+
selection,
1267+
),
1268+
uiAlreadyUpdated,
1269+
);
12811270
}
12821271

12831272
Future<bool> setSelection(GenericInstanceRef selection) async {

0 commit comments

Comments
 (0)