Skip to content

Commit 09e1278

Browse files
kenzieschmollkenzieschmoll
authored
Bump flutter candidate and update formatting. (#9165)
1 parent 2f4301e commit 09e1278

File tree

335 files changed

+5632
-6196
lines changed

Some content is hidden

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

335 files changed

+5632
-6196
lines changed

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
7575
echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
7676
sudo apt-get update
77-
sudo apt-get install dcm=1.24.2-1 # To avoid errors add `-1` (build number) to the version
77+
sudo apt-get install dcm=1.28.0-1 # To avoid errors add `-1` (build number) to the version
7878
sudo chmod +x /usr/bin/dcm
7979
echo "$(dcm --version)"
8080
- name: Setup Dart SDK

‎flutter-candidate.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a7f820163c5d7d5321872c60f22fa047fb94bd7b
1+
80d0409d137acdd55af4124b7622915c062c9d21

‎packages/devtools_app/benchmark/devtools_benchmarks_test.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ Future<void> _runBenchmarks({bool useWasm = false}) async {
5353
final taskResult = await serveWebBenchmark(
5454
benchmarkAppDirectory: projectRootDirectory(),
5555
entryPoint: generateBenchmarkEntryPoint(useWasm: useWasm),
56-
compilationOptions:
57-
useWasm
58-
? const CompilationOptions.wasm()
59-
: const CompilationOptions.js(),
56+
compilationOptions: useWasm
57+
? const CompilationOptions.wasm()
58+
: const CompilationOptions.js(),
6059
treeShakeIcons: false,
6160
benchmarkPath: benchmarkPath(useWasm: useWasm),
6261
);

‎packages/devtools_app/benchmark/scripts/run_benchmarks.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ Future<BenchmarkResults> runBenchmarks({
5656
await serveWebBenchmark(
5757
benchmarkAppDirectory: projectRootDirectory(),
5858
entryPoint: generateBenchmarkEntryPoint(useWasm: useWasm),
59-
compilationOptions:
60-
useWasm
61-
? const CompilationOptions.wasm()
62-
: const CompilationOptions.js(),
59+
compilationOptions: useWasm
60+
? const CompilationOptions.wasm()
61+
: const CompilationOptions.js(),
6362
treeShakeIcons: false,
6463
benchmarkPath: benchmarkPath(useWasm: useWasm),
6564
headless: !useBrowser,

‎packages/devtools_app/benchmark/test_infra/client/client_shared.dart

+7-12
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@ import '../devtools_recorder.dart';
1010
typedef RecorderFactory = Recorder Function();
1111

1212
final benchmarks = <String, RecorderFactory>{
13-
DevToolsBenchmark.navigateThroughOfflineScreens.id:
14-
() => DevToolsRecorder(
15-
benchmark: DevToolsBenchmark.navigateThroughOfflineScreens,
16-
),
17-
DevToolsBenchmark.offlineCpuProfilerScreen.id:
18-
() => DevToolsRecorder(
19-
benchmark: DevToolsBenchmark.offlineCpuProfilerScreen,
20-
),
21-
DevToolsBenchmark.offlinePerformanceScreen.id:
22-
() => DevToolsRecorder(
23-
benchmark: DevToolsBenchmark.offlinePerformanceScreen,
24-
),
13+
DevToolsBenchmark.navigateThroughOfflineScreens.id: () => DevToolsRecorder(
14+
benchmark: DevToolsBenchmark.navigateThroughOfflineScreens,
15+
),
16+
DevToolsBenchmark.offlineCpuProfilerScreen.id: () =>
17+
DevToolsRecorder(benchmark: DevToolsBenchmark.offlineCpuProfilerScreen),
18+
DevToolsBenchmark.offlinePerformanceScreen.id: () =>
19+
DevToolsRecorder(benchmark: DevToolsBenchmark.offlinePerformanceScreen),
2520
};

‎packages/devtools_app/benchmark/test_infra/common.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ const _benchmarkInitialPage = '';
1212

1313
const _wasmQueryParameters = {'wasm': 'true'};
1414

15-
String benchmarkPath({required bool useWasm}) =>
16-
Uri(
17-
path: _benchmarkInitialPage,
18-
queryParameters: useWasm ? _wasmQueryParameters : null,
19-
).toString();
15+
String benchmarkPath({required bool useWasm}) => Uri(
16+
path: _benchmarkInitialPage,
17+
queryParameters: useWasm ? _wasmQueryParameters : null,
18+
).toString();
2019

2120
String generateBenchmarkEntryPoint({required bool useWasm}) {
2221
return 'benchmark/test_infra/client/client_${useWasm ? 'wasm' : 'js'}.dart';

‎packages/devtools_app/integration_test/run_tests.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void main(List<String> args) async {
5555
testRunnerArgs: testRunnerArgs,
5656
runTest: _runTest,
5757
newArgsGenerator: (args) => DevToolsAppTestRunnerArgs(args),
58-
testIsSupported:
59-
(testFile) => testRunnerArgs.testAppDevice.supportsTest(testFile.path),
58+
testIsSupported: (testFile) =>
59+
testRunnerArgs.testAppDevice.supportsTest(testFile.path),
6060
debugLogging: debugTestScript,
6161
);
6262
}

‎packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart

+8-10
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,10 @@ Future<void> _verifyExtensionsSettingsMenu(
268268
await _openExtensionSettingsMenu(tester);
269269

270270
expect(find.byType(ExtensionSetting), findsNWidgets(enabledStates.length));
271-
final toggleButtonGroups =
272-
tester
273-
.widgetList(find.byType(DevToolsToggleButtonGroup))
274-
.cast<DevToolsToggleButtonGroup>()
275-
.toList();
271+
final toggleButtonGroups = tester
272+
.widgetList(find.byType(DevToolsToggleButtonGroup))
273+
.cast<DevToolsToggleButtonGroup>()
274+
.toList();
276275
for (int i = 0; i < toggleButtonGroups.length; i++) {
277276
logStatus('verify extension settings toggle button states (index $i)');
278277
final group = toggleButtonGroups[i];
@@ -313,11 +312,10 @@ Future<void> _changeExtensionSetting(
313312
'changing the extension setting at index $extensionIndex to value $settingValue',
314313
);
315314
await _openExtensionSettingsMenu(tester);
316-
final extensionSetting =
317-
tester
318-
.widgetList(find.byType(DevToolsToggleButtonGroup))
319-
.cast<DevToolsToggleButtonGroup>()
320-
.toList()[extensionIndex];
315+
final extensionSetting = tester
316+
.widgetList(find.byType(DevToolsToggleButtonGroup))
317+
.cast<DevToolsToggleButtonGroup>()
318+
.toList()[extensionIndex];
321319
await tester.tap(
322320
find.descendant(
323321
of: find.byWidget(extensionSetting),

‎packages/devtools_app/integration_test/test_infra/run/_test_app_driver.dart

+13-14
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,9 @@ class TestFlutterApp extends IntegrationTestApp {
133133
return _timeoutWithMessages<Map<String, Object?>>(
134134
() => response.future,
135135
timeout: timeout,
136-
message:
137-
event != null
138-
? 'Did not receive expected $event event.'
139-
: 'Did not receive response to request "$id".',
136+
message: event != null
137+
? 'Did not receive expected $event event.'
138+
: 'Did not receive response to request "$id".',
140139
).whenComplete(() => sub.cancel());
141140
}
142141

@@ -350,8 +349,8 @@ abstract class IntegrationTestApp with IOMixin {
350349
_debugPrint('Waiting for process to end');
351350
return runProcess!.exitCode.timeout(
352351
IOMixin.killTimeout,
353-
onTimeout:
354-
() => killGracefully(runProcess!, debugLogging: debugTestScript),
352+
onTimeout: () =>
353+
killGracefully(runProcess!, debugLogging: debugTestScript),
355354
);
356355
}
357356

@@ -387,8 +386,9 @@ abstract class IntegrationTestApp with IOMixin {
387386

388387
String _debugPrint(String msg) {
389388
const maxLength = 500;
390-
final truncatedMsg =
391-
msg.length > maxLength ? '${msg.substring(0, maxLength)}...' : msg;
389+
final truncatedMsg = msg.length > maxLength
390+
? '${msg.substring(0, maxLength)}...'
391+
: msg;
392392
_allMessages.add(truncatedMsg);
393393
debugLog('_TestApp - $truncatedMsg');
394394
return msg;
@@ -404,12 +404,11 @@ Uri convertToWebSocketUrl({required Uri serviceProtocolUrl}) {
404404
serviceProtocolUrl.isScheme('https');
405405
final scheme = isSecure ? 'wss' : 'ws';
406406

407-
final path =
408-
serviceProtocolUrl.path.endsWith('/ws')
409-
? serviceProtocolUrl.path
410-
: (serviceProtocolUrl.path.endsWith('/')
411-
? '${serviceProtocolUrl.path}ws'
412-
: '${serviceProtocolUrl.path}/ws');
407+
final path = serviceProtocolUrl.path.endsWith('/ws')
408+
? serviceProtocolUrl.path
409+
: (serviceProtocolUrl.path.endsWith('/')
410+
? '${serviceProtocolUrl.path}ws'
411+
: '${serviceProtocolUrl.path}/ws');
413412

414413
return serviceProtocolUrl.replace(scheme: scheme, path: path);
415414
}

‎packages/devtools_app/integration_test/test_infra/run/run_test.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,10 @@ Future<void> runFlutterIntegrationTest(
8989
class DevToolsAppTestRunnerArgs extends IntegrationTestRunnerArgs {
9090
DevToolsAppTestRunnerArgs(super.args, {super.verifyValidTarget = true})
9191
: super(addExtraArgs: _addExtraArgs) {
92-
testAppDevice =
93-
TestAppDevice.fromArgName(
94-
argResults.option(_testAppDeviceArg) ??
95-
TestAppDevice.flutterTester.argName,
96-
)!;
92+
testAppDevice = TestAppDevice.fromArgName(
93+
argResults.option(_testAppDeviceArg) ??
94+
TestAppDevice.flutterTester.argName,
95+
)!;
9796
}
9897

9998
/// The type of device for the test app to run on.

‎packages/devtools_app/lib/src/app.dart

+42-44
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,17 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
8787
if (FeatureFlags.devToolsExtensions) {
8888
// TODO(https://github.com/flutter/devtools/issues/6273): stop special
8989
// casing the package:provider extension.
90-
final containsProviderExtension =
91-
extensionService.currentExtensions.value.visibleExtensions
92-
.where((e) => e.name == 'provider')
93-
.isNotEmpty;
94-
final devToolsScreens =
95-
containsProviderExtension
96-
? _originalScreens
97-
.where((s) => s.screenId != ScreenMetaData.provider.id)
98-
.toList()
99-
: _originalScreens;
90+
final containsProviderExtension = extensionService
91+
.currentExtensions
92+
.value
93+
.visibleExtensions
94+
.where((e) => e.name == 'provider')
95+
.isNotEmpty;
96+
final devToolsScreens = containsProviderExtension
97+
? _originalScreens
98+
.where((s) => s.screenId != ScreenMetaData.provider.id)
99+
.toList()
100+
: _originalScreens;
100101
return [...devToolsScreens, ..._extensionScreens];
101102
}
102103
return _originalScreens;
@@ -287,16 +288,15 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
287288
extensionService.currentExtensions,
288289
],
289290
builder: (_, _, child) {
290-
final screensInScaffold =
291-
_visibleScreens()
292-
.where(
293-
(s) => maybeIncludeOnlyEmbeddedScreen(
294-
s,
295-
page: page,
296-
embedMode: embedMode,
297-
),
298-
)
299-
.toList();
291+
final screensInScaffold = _visibleScreens()
292+
.where(
293+
(s) => maybeIncludeOnlyEmbeddedScreen(
294+
s,
295+
page: page,
296+
embedMode: embedMode,
297+
),
298+
)
299+
.toList();
300300

301301
removeHiddenScreens(screensInScaffold, queryParams);
302302

@@ -354,26 +354,25 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
354354
embedMode: embedMode,
355355
page: page,
356356
screens: screensInScaffold,
357-
actions:
358-
isEmbedded()
359-
? []
360-
: [
361-
if (paramsContainVmServiceUri) ...[
362-
// Hide the hot reload button for Dart web apps, where the
363-
// hot reload service extension is not avilable and where the
364-
// [service.reloadServices] RPC is not implemented.
365-
// TODO(https://github.com/flutter/devtools/issues/6441): find
366-
// a way to show this for Dart web apps when supported.
367-
if (!connectedToDartWebApp)
368-
HotReloadButton(
369-
callOnVmServiceDirectly: !connectedToFlutterApp,
370-
),
371-
// This button will hide itself based on whether the
372-
// hot restart service is available for the connected app.
373-
const HotRestartButton(),
374-
],
375-
...DevToolsScaffold.defaultActions(),
357+
actions: isEmbedded()
358+
? []
359+
: [
360+
if (paramsContainVmServiceUri) ...[
361+
// Hide the hot reload button for Dart web apps, where the
362+
// hot reload service extension is not avilable and where the
363+
// [service.reloadServices] RPC is not implemented.
364+
// TODO(https://github.com/flutter/devtools/issues/6441): find
365+
// a way to show this for Dart web apps when supported.
366+
if (!connectedToDartWebApp)
367+
HotReloadButton(
368+
callOnVmServiceDirectly: !connectedToFlutterApp,
369+
),
370+
// This button will hide itself based on whether the
371+
// hot restart service is available for the connected app.
372+
const HotRestartButton(),
376373
],
374+
...DevToolsScaffold.defaultActions(),
375+
],
377376
);
378377
}
379378
return scaffold;
@@ -657,8 +656,8 @@ class ScreenUnavailable extends StatelessWidget {
657656
if (embedMode == EmbedMode.none) ...[
658657
const SizedBox(height: defaultSpacing),
659658
ElevatedButton(
660-
onPressed:
661-
() => routerDelegate.navigateHome(clearScreenParam: true),
659+
onPressed: () =>
660+
routerDelegate.navigateHome(clearScreenParam: true),
662661
child: const Text('Go to Home screen'),
663662
),
664663
],
@@ -702,9 +701,8 @@ List<DevToolsScreen> defaultScreens({
702701
),
703702
DevToolsScreen<DebuggerController>(
704703
DebuggerScreen(),
705-
createController:
706-
(routerDelegate) =>
707-
DebuggerController(routerDelegate: routerDelegate),
704+
createController: (routerDelegate) =>
705+
DebuggerController(routerDelegate: routerDelegate),
708706
),
709707
DevToolsScreen<NetworkController>(
710708
NetworkScreen(),

‎packages/devtools_app/lib/src/extensions/embedded/_controller_web.dart

+8-10
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ class EmbeddedExtensionControllerImpl extends EmbeddedExtensionController
6161
);
6262
final queryParams = {
6363
...DevToolsQueryParams.load().params,
64-
ExtensionEventParameters.theme:
65-
isDarkThemeEnabled()
66-
? ExtensionEventParameters.themeValueDark
67-
: ExtensionEventParameters.themeValueLight,
64+
ExtensionEventParameters.theme: isDarkThemeEnabled()
65+
? ExtensionEventParameters.themeValueDark
66+
: ExtensionEventParameters.themeValueLight,
6867
if (dtdManager.uri != null) 'dtdUri': dtdManager.uri.toString(),
6968
};
7069
return Uri.parse(baseUri).replace(queryParameters: queryParams).toString();
@@ -89,12 +88,11 @@ class EmbeddedExtensionControllerImpl extends EmbeddedExtensionController
8988
);
9089
_initialized = true;
9190

92-
_extensionIFrame =
93-
HTMLIFrameElement()
94-
// This url is safe because we built it ourselves and it does not include
95-
// any user input.
96-
..src = extensionUrl
97-
..allow = 'usb';
91+
_extensionIFrame = HTMLIFrameElement()
92+
// This url is safe because we built it ourselves and it does not include
93+
// any user input.
94+
..src = extensionUrl
95+
..allow = 'usb';
9896
_extensionIFrame.style
9997
..border = 'none'
10098
..height = '100%'

‎packages/devtools_app/lib/src/extensions/embedded/_view_web.dart

+12-15
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,9 @@ class _ExtensionIFrameController extends DisposableController
148148

149149
addAutoDisposeListener(preferences.darkModeEnabled, () {
150150
updateTheme(
151-
theme:
152-
isDarkThemeEnabled()
153-
? ExtensionEventParameters.themeValueDark
154-
: ExtensionEventParameters.themeValueLight,
151+
theme: isDarkThemeEnabled()
152+
? ExtensionEventParameters.themeValueDark
153+
: ExtensionEventParameters.themeValueLight,
155154
);
156155
});
157156
}
@@ -184,10 +183,9 @@ class _ExtensionIFrameController extends DisposableController
184183
if (extensionEvent != null) {
185184
onEventReceived(
186185
extensionEvent,
187-
onUnknownEvent:
188-
() => notificationService.push(
189-
'Unknown event received from extension: $extensionEvent}',
190-
),
186+
onUnknownEvent: () => notificationService.push(
187+
'Unknown event received from extension: $extensionEvent}',
188+
),
191189
);
192190
}
193191
}
@@ -316,13 +314,12 @@ class _ExtensionIFrameController extends DisposableController
316314
screenId: '${showBannerMessageEvent.extensionName}_ext',
317315
dismissOnConnectionChanges:
318316
showBannerMessageEvent.dismissOnConnectionChanges,
319-
buildTextSpans:
320-
(_) => [
321-
TextSpan(
322-
text: showBannerMessageEvent.message,
323-
style: TextStyle(fontSize: defaultFontSize),
324-
),
325-
],
317+
buildTextSpans: (_) => [
318+
TextSpan(
319+
text: showBannerMessageEvent.message,
320+
style: TextStyle(fontSize: defaultFontSize),
321+
),
322+
],
326323
);
327324
bannerMessages.addMessage(
328325
bannerMessage,

0 commit comments

Comments
 (0)