Skip to content

Commit ca4a472

Browse files
authored
Bump flutter_lints to 6.0.0 (#9792)
1 parent 7faf9ff commit ca4a472

16 files changed

Lines changed: 25 additions & 33 deletions

File tree

packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ class DeepLinksController extends DevToolsScreenController
444444
appLink.intentFilterChecks,
445445
),
446446
os: {PlatformOS.android},
447-
scheme: {if (scheme != null) scheme},
447+
scheme: {?scheme},
448448
);
449449
} else {
450450
final linkData = domainPathToLinkData[domainAndPath]!;

packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ArrowWrapper extends StatelessWidget {
100100
),
101101
),
102102
),
103-
if (child != null) child!,
103+
?child,
104104
Expanded(
105105
child: Container(
106106
margin: EdgeInsets.only(

packages/devtools_app/lib/src/screens/logging/metadata.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ class MetadataChips extends StatelessWidget {
9797
FrameElapsedMetaDataChip(
9898
elapsedTimeDisplay: elapsedFrameTimeAsString,
9999
),
100-
if (isolateChip != null) isolateChip,
101-
if (zoneChip != null) zoneChip,
100+
?isolateChip,
101+
?zoneChip,
102102
],
103103
);
104104
}

packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis_model.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ class FrameAnalysis {
9292
final paintEvent = uiEvent.firstChildWithCondition(
9393
(event) => FramePhaseType.paint.isMatchForEventName(event.name),
9494
);
95-
return FramePhase.paint(
96-
events: <FlutterTimelineEvent>[if (paintEvent != null) paintEvent],
97-
);
95+
return FramePhase.paint(events: <FlutterTimelineEvent>[?paintEvent]);
9896
}
9997

10098
/// Data for the raster phase of [frame].

packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,13 +745,11 @@ class CpuProfileData with Serializable {
745745
List<CpuStackFrame>? _bottomUpRoots;
746746

747747
late final userTags = <String>{
748-
for (final cpuSample in cpuSamples)
749-
if (cpuSample.userTag case final userTag?) userTag,
748+
for (final cpuSample in cpuSamples) ?cpuSample.userTag,
750749
};
751750

752751
late final vmTags = <String>{
753-
for (final cpuSample in cpuSamples)
754-
if (cpuSample.vmTag case final vmTag?) vmTag,
752+
for (final cpuSample in cpuSamples) ?cpuSample.vmTag,
755753
};
756754

757755
CpuStackFrame? selectedStackFrame;

packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class _ProcessMemoryTree extends StatelessWidget {
194194
keyFactory: (e) =>
195195
PageStorageKey<String>('${e.name}+${e.depth}+${e.byteSize}'),
196196
displayTreeGuidelines: true,
197-
dataRoots: [if (root != null) root],
197+
dataRoots: [?root],
198198
dataKey: 'process-memory-tree',
199199
columns: columns,
200200
treeColumn: categoryColumn,

packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class VMInfoList extends StatelessWidget {
155155
),
156156
),
157157
),
158-
if (table != null) table,
158+
?table,
159159
],
160160
);
161161
}

packages/devtools_app/lib/src/shared/console/console.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ConsoleFrame extends StatelessWidget {
4949
child: Column(
5050
crossAxisAlignment: CrossAxisAlignment.stretch,
5151
children: [
52-
if (title != null) title!,
52+
?title,
5353
Expanded(child: child),
5454
],
5555
),

packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ Uri _newDevToolsGitHubIssueUri({
134134
String? additionalInfo,
135135
String? issueTitle,
136136
}) {
137-
final issueBody = [
138-
if (additionalInfo != null) additionalInfo,
139-
...environment,
140-
].join('\n');
137+
final issueBody = [?additionalInfo, ...environment].join('\n');
141138

142139
return Uri.parse(
143140
'https://$_newDevToolsIssueUriDisplay',

packages/devtools_app/lib/src/shared/server/server_api_client.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class DevToolsServerConnection {
117117
'jsonrpc': '2.0',
118118
'id': id,
119119
'method': method,
120-
if (params != null) 'params': params,
120+
'params': ?params,
121121
});
122122
final completer = Completer<T>();
123123
_completers[id] = completer;

0 commit comments

Comments
 (0)