Skip to content

Commit 4cb2cc3

Browse files
bkonyibkonyi
committed
Merge branch 'format_webdev' of github.com:dart-lang/webdev into format_webdev
2 parents 52513b8 + 7935fd4 commit 4cb2cc3

39 files changed

+515
-458
lines changed

‎dwds/lib/src/injected/client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dwds/lib/src/version.dart‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dwds/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dwds
22
# Every time this changes you need to run `dart run build_runner build`.
3-
version: 25.1.0
3+
version: 25.1.1-wip
44

55
description: >-
66
A service that proxies between the Chrome debug protocol and the Dart VM

‎fixtures/_test/example/hello_world/main.dart‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ final topLevelList = () {
2828
}();
2929

3030
final topLevelMap = LinkedHashMap.from(
31-
Iterable.generate(1001).toList().reversed.toList().asMap());
31+
Iterable.generate(1001).toList().reversed.toList().asMap(),
32+
);
3233

3334
final myInstance = MyTestClass();
3435

@@ -54,17 +55,23 @@ void main() async {
5455
};
5556

5657
context['registerExtension'] = (String method) {
57-
registerExtension(method,
58-
(String method, Map<String, String> parameters) async {
58+
registerExtension(method, (
59+
String method,
60+
Map<String, String> parameters,
61+
) async {
5962
return ServiceExtensionResponse.result(jsonEncode(parameters));
6063
});
6164
};
6265

6366
context['registerExtensionWithError'] = (String method) {
64-
registerExtension(method,
65-
(String method, Map<String, String> parameters) async {
67+
registerExtension(method, (
68+
String method,
69+
Map<String, String> parameters,
70+
) async {
6671
return ServiceExtensionResponse.error(
67-
int.parse(parameters['code']!), parameters['details']!);
72+
int.parse(parameters['code']!),
73+
parameters['details']!,
74+
);
6875
});
6976
};
7077

@@ -90,8 +97,10 @@ void main() async {
9097

9198
// Register one up front before the proxy connects, the isolate should still
9299
// recognize this as an available extension.
93-
registerExtension('ext.hello_world.existing',
94-
(_, __) => Future.value(ServiceExtensionResponse.error(0, '')));
100+
registerExtension(
101+
'ext.hello_world.existing',
102+
(_, __) => Future.value(ServiceExtensionResponse.error(0, '')),
103+
);
95104

96105
window.console.debug('Page Ready');
97106
}

‎fixtures/_test_hot_restart2/web/main.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ external void log(String _);
2626

2727
class ConstObject {
2828
const ConstObject();
29-
String get text => 'ConstObject('
29+
String get text =>
30+
'ConstObject('
3031
'reloadVariable: $variableToModifyToForceRecompile, '
3132
'${value1 == value2 ? 'ConstantEqualitySuccess' : 'ConstantEqualityFailure'})';
3233
}

‎fixtures/_test_package/web/main.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ void printLargeScope() {
216216
final t19 = 19;
217217

218218
// dart format off
219-
print(
220-
'$t0 $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, '
219+
print('$t0 $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, '
221220
'$t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19'); // Breakpoint: printLargeScope
222221
// dart format on
223222
}

‎frontend_server_client/example/vm_client.dart‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ void main(List<String> args) async {
4343
.transform(utf8.decoder)
4444
.transform(const LineSplitter())
4545
.listen((line) {
46-
stdout.writeln('APP -> $line');
47-
if (line == 'hello/world') {
48-
sawHelloWorld.complete();
49-
}
50-
if (line.startsWith(
51-
'The Dart DevTools debugger and profiler is available at:',
52-
)) {
53-
final observatoryUri =
54-
'${line.split(' ').last.replaceFirst('http', 'ws')}ws';
55-
vmServiceCompleter.complete(vmServiceConnectUri(observatoryUri));
56-
}
57-
});
46+
stdout.writeln('APP -> $line');
47+
if (line == 'hello/world') {
48+
sawHelloWorld.complete();
49+
}
50+
if (line.startsWith(
51+
'The Dart DevTools debugger and profiler is available at:',
52+
)) {
53+
final observatoryUri =
54+
'${line.split(' ').last.replaceFirst('http', 'ws')}ws';
55+
vmServiceCompleter.complete(vmServiceConnectUri(observatoryUri));
56+
}
57+
});
5858
appProcess.stderr
5959
.transform(utf8.decoder)
6060
.transform(const LineSplitter())
6161
.listen((line) {
62-
stderr.writeln('APP -> $line');
63-
});
62+
stderr.writeln('APP -> $line');
63+
});
6464

6565
final vmService = await vmServiceCompleter.future;
6666
await sawHelloWorld.future;

‎frontend_server_client/example/web_client.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ void _print(String message) {
166166
}
167167

168168
void _prompt() => stdout.write(
169-
'Enter a new message to print and recompile, or type `quit` to exit:',
170-
);
169+
'Enter a new message to print and recompile, or type `quit` to exit:',
170+
);
171171

172172
final app = 'example/app/main.dart';
173173
final dartSdkJs = p.join('.dart_tool', 'out', 'dart_sdk.js');

‎frontend_server_client/lib/src/dartdevc_frontend_server_client.dart‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ class DartDevcFrontendServerClient implements FrontendServerClient {
4444
this._frontendServerClient,
4545
this._entrypoint,
4646
String moduleFormat,
47-
) : _bootstrapJs = moduleFormat == 'amd'
48-
? generateAmdBootstrapScript(
49-
requireUrl: 'require.js',
50-
mapperUrl: 'dart_stack_trace_mapper.js',
51-
entrypoint: _entrypoint,
52-
)
53-
: null,
54-
_mainModuleJs = moduleFormat == 'amd'
55-
? generateAmdMainModule(entrypoint: _entrypoint)
56-
: null {
47+
) : _bootstrapJs = moduleFormat == 'amd'
48+
? generateAmdBootstrapScript(
49+
requireUrl: 'require.js',
50+
mapperUrl: 'dart_stack_trace_mapper.js',
51+
entrypoint: _entrypoint,
52+
)
53+
: null,
54+
_mainModuleJs = moduleFormat == 'amd'
55+
? generateAmdMainModule(entrypoint: _entrypoint)
56+
: null {
5757
_resetAssets();
5858
}
5959

@@ -152,10 +152,9 @@ class DartDevcFrontendServerClient implements FrontendServerClient {
152152
required String klass,
153153
required String libraryUri,
154154
required List<String> typeDefinitions,
155-
}) =>
156-
throw UnsupportedError(
157-
'Use `compileExpressionToJs` for dartdevc based clients',
158-
);
155+
}) => throw UnsupportedError(
156+
'Use `compileExpressionToJs` for dartdevc based clients',
157+
);
159158

160159
@override
161160
Future<CompileResult> compileExpressionToJs({
@@ -166,16 +165,15 @@ class DartDevcFrontendServerClient implements FrontendServerClient {
166165
required String libraryUri,
167166
required int line,
168167
required String moduleName,
169-
}) =>
170-
_frontendServerClient.compileExpressionToJs(
171-
expression: expression,
172-
column: column,
173-
jsFrameValues: jsFrameValues,
174-
jsModules: jsModules,
175-
libraryUri: libraryUri,
176-
line: line,
177-
moduleName: moduleName,
178-
);
168+
}) => _frontendServerClient.compileExpressionToJs(
169+
expression: expression,
170+
column: column,
171+
jsFrameValues: jsFrameValues,
172+
jsModules: jsModules,
173+
libraryUri: libraryUri,
174+
line: line,
175+
moduleName: moduleName,
176+
);
179177

180178
@override
181179
void accept() {
@@ -220,5 +218,6 @@ class DartDevcFrontendServerClient implements FrontendServerClient {
220218
}
221219
}
222220

223-
final _dartdevcPlatformKernel =
224-
p.toUri(p.join(sdkDir, 'lib', '_internal', 'ddc_sdk.dill')).toString();
221+
final _dartdevcPlatformKernel = p
222+
.toUri(p.join(sdkDir, 'lib', '_internal', 'ddc_sdk.dill'))
223+
.toString();

‎frontend_server_client/lib/src/frontend_server_client.dart‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class FrontendServerClient {
2525
this._feServer,
2626
this._feServerStdoutLines, {
2727
bool? verbose,
28-
}) : _verbose = verbose ?? false,
29-
_state = _ClientState.waitingForFirstCompile {
28+
}) : _verbose = verbose ?? false,
29+
_state = _ClientState.waitingForFirstCompile {
3030
_feServer.stderr.transform(utf8.decoder).listen(stderr.write);
3131
}
3232

@@ -196,8 +196,8 @@ class FrontendServerClient {
196196
final compilerOutputLines = <String>[];
197197
var errorCount = 0;
198198
String? outputDillPath;
199-
while (
200-
state != _CompileState.done && await _feServerStdoutLines.hasNext) {
199+
while (state != _CompileState.done &&
200+
await _feServerStdoutLines.hasNext) {
201201
final line = await _nextInputLine();
202202
switch (state) {
203203
case _CompileState.started:
@@ -256,8 +256,7 @@ class FrontendServerClient {
256256
required String klass,
257257
required String libraryUri,
258258
required List<String> typeDefinitions,
259-
}) =>
260-
throw UnimplementedError();
259+
}) => throw UnimplementedError();
261260

262261
/// TODO: Document
263262
Future<CompileResult> compileExpressionToJs({
@@ -268,8 +267,7 @@ class FrontendServerClient {
268267
required String libraryUri,
269268
required int line,
270269
required String moduleName,
271-
}) =>
272-
throw UnimplementedError();
270+
}) => throw UnimplementedError();
273271

274272
/// Should be invoked when results of compilation are accepted by the client.
275273
///

0 commit comments

Comments
 (0)