From 5716109ecee7d1ae1d29aea68f5457676a6e44a4 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 20 Apr 2026 10:54:26 -0700 Subject: [PATCH] Bump flutter_lints to 6.0.0 --- .../deep_link_validation/deep_links_controller.dart | 2 +- .../lib/src/screens/inspector/inspector_breadcrumbs.dart | 2 +- .../src/screens/inspector/layout_explorer/ui/arrow.dart | 2 +- .../screens/inspector_v2/layout_explorer/ui/arrow.dart | 2 +- .../devtools_app/lib/src/screens/logging/metadata.dart | 4 ++-- .../panes/frame_analysis/frame_analysis_model.dart | 4 +--- .../lib/src/screens/profiler/cpu_profile_model.dart | 6 ++---- .../vm_developer/process_memory/process_memory_view.dart | 2 +- .../screens/vm_developer/vm_developer_common_widgets.dart | 2 +- packages/devtools_app/lib/src/shared/console/console.dart | 2 +- .../environment_parameters_external.dart | 5 +---- .../lib/src/shared/server/server_api_client.dart | 2 +- packages/devtools_app/lib/src/shared/ui/side_panel.dart | 2 +- packages/devtools_app/lib/src/shared/utils/utils.dart | 2 +- .../fixtures/flutter_app/lib/src/autocomplete.dart | 5 ++--- .../standalone_ui/editor_service/simulated_editor.dart | 8 ++++---- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 18 files changed, 27 insertions(+), 35 deletions(-) diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart index 6e51d115fe0..4464b8c2a09 100644 --- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart +++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart @@ -444,7 +444,7 @@ class DeepLinksController extends DevToolsScreenController appLink.intentFilterChecks, ), os: {PlatformOS.android}, - scheme: {if (scheme != null) scheme}, + scheme: {?scheme}, ); } else { final linkData = domainPathToLinkData[domainAndPath]!; diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_breadcrumbs.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_breadcrumbs.dart index f5db041746e..1122b3e3697 100644 --- a/packages/devtools_app/lib/src/screens/inspector/inspector_breadcrumbs.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_breadcrumbs.dart @@ -126,7 +126,7 @@ class _InspectorBreadcrumb extends StatelessWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - if (icon != null) icon, + ?icon, Flexible(child: text), ], ), diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart index 7fcf002900a..943e4c98c74 100644 --- a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart +++ b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart @@ -100,7 +100,7 @@ class ArrowWrapper extends StatelessWidget { ), ), ), - if (child != null) child!, + ?child, Expanded( child: Container( margin: EdgeInsets.only( diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart b/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart index 3adb4e615cb..6035809f3a8 100644 --- a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart +++ b/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart @@ -100,7 +100,7 @@ class ArrowWrapper extends StatelessWidget { ), ), ), - if (child != null) child!, + ?child, Expanded( child: Container( margin: EdgeInsets.only( diff --git a/packages/devtools_app/lib/src/screens/logging/metadata.dart b/packages/devtools_app/lib/src/screens/logging/metadata.dart index 9ac216e67e0..081762ca4ef 100644 --- a/packages/devtools_app/lib/src/screens/logging/metadata.dart +++ b/packages/devtools_app/lib/src/screens/logging/metadata.dart @@ -97,8 +97,8 @@ class MetadataChips extends StatelessWidget { FrameElapsedMetaDataChip( elapsedTimeDisplay: elapsedFrameTimeAsString, ), - if (isolateChip != null) isolateChip, - if (zoneChip != null) zoneChip, + ?isolateChip, + ?zoneChip, ], ); } diff --git a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis_model.dart b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis_model.dart index d1316e41ad0..0e82e25d060 100644 --- a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis_model.dart +++ b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis_model.dart @@ -92,9 +92,7 @@ class FrameAnalysis { final paintEvent = uiEvent.firstChildWithCondition( (event) => FramePhaseType.paint.isMatchForEventName(event.name), ); - return FramePhase.paint( - events: [if (paintEvent != null) paintEvent], - ); + return FramePhase.paint(events: [?paintEvent]); } /// Data for the raster phase of [frame]. diff --git a/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart b/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart index 038bf98459a..f1eb442f8e4 100644 --- a/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart +++ b/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart @@ -745,13 +745,11 @@ class CpuProfileData with Serializable { List? _bottomUpRoots; late final userTags = { - for (final cpuSample in cpuSamples) - if (cpuSample.userTag case final userTag?) userTag, + for (final cpuSample in cpuSamples) ?cpuSample.userTag, }; late final vmTags = { - for (final cpuSample in cpuSamples) - if (cpuSample.vmTag case final vmTag?) vmTag, + for (final cpuSample in cpuSamples) ?cpuSample.vmTag, }; CpuStackFrame? selectedStackFrame; diff --git a/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart index 1b453e0fa9c..9ae5d1d7554 100644 --- a/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart +++ b/packages/devtools_app/lib/src/screens/vm_developer/process_memory/process_memory_view.dart @@ -194,7 +194,7 @@ class _ProcessMemoryTree extends StatelessWidget { keyFactory: (e) => PageStorageKey('${e.name}+${e.depth}+${e.byteSize}'), displayTreeGuidelines: true, - dataRoots: [if (root != null) root], + dataRoots: [?root], dataKey: 'process-memory-tree', columns: columns, treeColumn: categoryColumn, diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart index ac39521f9ab..06f7f6c9914 100644 --- a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart +++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart @@ -155,7 +155,7 @@ class VMInfoList extends StatelessWidget { ), ), ), - if (table != null) table, + ?table, ], ); } diff --git a/packages/devtools_app/lib/src/shared/console/console.dart b/packages/devtools_app/lib/src/shared/console/console.dart index c9840ce9312..91ead2a0640 100644 --- a/packages/devtools_app/lib/src/shared/console/console.dart +++ b/packages/devtools_app/lib/src/shared/console/console.dart @@ -49,7 +49,7 @@ class ConsoleFrame extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - if (title != null) title!, + ?title, Expanded(child: child), ], ), diff --git a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart index 30cd68fb0f5..d46afca09e1 100644 --- a/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart +++ b/packages/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart @@ -134,10 +134,7 @@ Uri _newDevToolsGitHubIssueUri({ String? additionalInfo, String? issueTitle, }) { - final issueBody = [ - if (additionalInfo != null) additionalInfo, - ...environment, - ].join('\n'); + final issueBody = [?additionalInfo, ...environment].join('\n'); return Uri.parse( 'https://$_newDevToolsIssueUriDisplay', diff --git a/packages/devtools_app/lib/src/shared/server/server_api_client.dart b/packages/devtools_app/lib/src/shared/server/server_api_client.dart index 8406975ee00..9e646ab89c2 100644 --- a/packages/devtools_app/lib/src/shared/server/server_api_client.dart +++ b/packages/devtools_app/lib/src/shared/server/server_api_client.dart @@ -117,7 +117,7 @@ class DevToolsServerConnection { 'jsonrpc': '2.0', 'id': id, 'method': method, - if (params != null) 'params': params, + 'params': ?params, }); final completer = Completer(); _completers[id] = completer; diff --git a/packages/devtools_app/lib/src/shared/ui/side_panel.dart b/packages/devtools_app/lib/src/shared/ui/side_panel.dart index 707c261865e..16d19434ebd 100644 --- a/packages/devtools_app/lib/src/shared/ui/side_panel.dart +++ b/packages/devtools_app/lib/src/shared/ui/side_panel.dart @@ -104,7 +104,7 @@ class SidePanelViewerState extends State ); return Stack( children: [ - if (child != null) child, + ?child, SidePanel( sidePanelController: widget.controller, visibilityAnimation: visibilityAnimation, diff --git a/packages/devtools_app/lib/src/shared/utils/utils.dart b/packages/devtools_app/lib/src/shared/utils/utils.dart index 5cc3e8af941..b19bd582841 100644 --- a/packages/devtools_app/lib/src/shared/utils/utils.dart +++ b/packages/devtools_app/lib/src/shared/utils/utils.dart @@ -110,7 +110,7 @@ List generateDeviceDescription( title: 'Connected app type', description: connectedApp.display, ), - if (vmServiceConnection != null) vmServiceConnection, + ?vmServiceConnection, ConnectionDescription(title: 'Dart Version', description: version), if (flutterVersion != null && !flutterVersion.unknown) ...{ ConnectionDescription( diff --git a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/autocomplete.dart b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/autocomplete.dart index 24ed3d8b975..befc2b5be92 100644 --- a/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/autocomplete.dart +++ b/packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/src/autocomplete.dart @@ -56,15 +56,14 @@ class AnotherClass { var someField = 3; static var someStaticField = 2; int get someProperty => 42; - // ignore: avoid-dynamic, gets in the way of testing. - set someSomeProperty(v) {} + set someSomeProperty(int v) {} } var someTopLevelField = 9; int get someTopLevelGetter => 42; -set someTopLevelSetter(v) {} +set someTopLevelSetter(int v) {} void someTopLevelMember() {} diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart index 4a18e78421a..c17709e6ad9 100644 --- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart +++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart @@ -310,10 +310,10 @@ class SimulatedEditor { FutureOr openDevToolsPage( String? _, - String? __, - bool ___, - bool ____, - bool _____, + String? _, + bool _, + bool _, + bool _, ) {} } diff --git a/pubspec.lock b/pubspec.lock index a55f54dfb00..a2a58765b4b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -360,10 +360,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.0.0" flutter_markdown: dependency: transitive description: @@ -515,10 +515,10 @@ packages: dependency: transitive description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.1.0" logging: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d5920002f05..0d862ed53c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,4 +14,4 @@ workspace: dev_dependencies: build_runner: ^2.5.4 - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0