Skip to content

Commit 4c64fcc

Browse files
author
Dart CI
committed
Version 3.4.0-212.0.dev
Merge cea23ff into dev
2 parents 4bc9735 + cea23ff commit 4c64fcc

File tree

7 files changed

+48
-221
lines changed

7 files changed

+48
-221
lines changed

DEPS

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,34 +143,34 @@ vars = {
143143
#
144144
# For more details, see https://github.com/dart-lang/sdk/issues/30164.
145145
"dart_style_rev": "a6ad7693555a9add6f98ad6fd94de80d35c89415", # disable tools/rev_sdk_deps.dart
146-
"dartdoc_rev": "cec45fbedf85b938670314e5bcdac3fbdde94f99",
146+
"dartdoc_rev": "0de8aff3d2feb6fb9fb5ecf5e4f699b3a0ef2c63",
147147
"ecosystem_rev": "49a3cbb9a2d8acf974b4d616e20c38b59c360a5a",
148148
"file_rev": "3aa06490bf34bddf04c7ea964a50c177a4ca0de7",
149149
"fixnum_rev": "570b28adcfbfdd5b8a7230ea1d6ec0f9587493f1",
150150
"flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
151151
"glob_rev": "379d60c7cc5c0e9fe7d0d45549ad0b1ca51396c8",
152152
"html_rev": "327e37a6a4dd46599737ee982f280d73a8f646f7",
153-
"http_rev": "470d2c3595c00252f92be21d2bc3d79816d0d8f2",
153+
"http_rev": "8d3c64747f9a6d99b29558b6e612dee83db7cdbb",
154154
"http_multi_server_rev": "ba9d07f3596b24718ddf45c9e071d40879cca565",
155155
"http_parser_rev": "84db8b029d9b51859a0bb4966859af009f9442e3",
156156
"intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
157157
"json_rpc_2_rev": "639857be892050159f5164c749d7947694976a4a",
158-
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c",
158+
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", #
159159
"lints_rev": "ead770872e272e25a64315c120950ea8ad5b2509",
160160
"logging_rev": "cbaf4ee2e59c318d7519edb5381f5fe2a7f69587",
161-
"markdown_rev": "dd47c5dea1015aff2037b613fb4964450beaf81c",
161+
"markdown_rev": "1ca51664e7b1b7fe789f6be2668c909ce3aea342",
162162
"matcher_rev": "d954c8d979579b4b46427b0ea1d9c721117c191e",
163163
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
164164
"mime_rev": "9a168712d6db610c3822617c132daea72d4fd2b5",
165165
"mockito_rev": "3ef744f8749864f2a036eba60c4203cc8f638949",
166166
"native_rev": "0901a3323022fdb59657cc2cb00ea5c80a8468a6", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
167-
"package_config_rev": "4a7042bb286cf0b41b26e87972bc28bda535f8b9",
167+
"package_config_rev": "3d90e6955ef19b7ce4f1b742a06a20ed4260700a",
168168
"path_rev": "a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4",
169169
"pool_rev": "c118f69d8a6441a8453bf7d455fd7c79d3ee1497",
170170
"protobuf_rev": "b7613581d847e1e36e76f0e36db3a412d8fea5b1",
171171
"pub_rev": "5b5fdd320a3b60a6a00bdd3122f03c6f67a39eeb", # disable tools/rev_sdk_deps.dart
172172
"pub_semver_rev": "3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16",
173-
"shelf_rev": "da6a69ba749aded85a215fba4882fc3964d2c49b",
173+
"shelf_rev": "1acbc673326e5b31280184744f2864a8f92c5b46",
174174
"source_map_stack_trace_rev": "c75649651d01826236e3ab7093d277a70756905a",
175175
"source_maps_rev": "55e92a4b0a8560d5b2b3bb7255249afdb8186ea6",
176176
"source_span_rev": "21a403a75b6887fbd811fb53b74b08c2cef67ab6",
@@ -188,13 +188,13 @@ vars = {
188188
"tools_rev": "fca993e4f287e8080f2a8d91dbfbace8b6a8a0bc",
189189
"typed_data_rev": "375efaa02a13dad0785cfbd9bdcb9f09aa8ef529",
190190
"usage_rev": "67ecd7d1328347ec15cbf8d8a46918df75a66af8",
191-
"vector_math_rev": "3706feb60f1fb0541dae9cf6b9ef91cd5ea766c6",
191+
"vector_math_rev": "7e705f734e94917e9a5347578e6e496f8db38ac6",
192192
"watcher_rev": "21858a41da1482922e03ee65cdf2169d01d59a67",
193-
"web_rev": "8870d04354cd1af4b77aeec6f4abd77a53bcc709",
193+
"web_rev": "51e594b35b516b8678825e27e2f2d8051a594a57",
194194
"web_socket_channel_rev": "3db86bc0a09e1038a0fa418262c8a92211c5de69",
195195
"webdev_rev": "51b5484348b4a8ede351e8dff0428b083495ba78", # https://github.com/flutter/devtools/issues/7231
196-
"webdriver_rev": "2c1b6f8b9d684caf62d72bb327c24f738a4e7455",
197-
"webkit_inspection_protocol_rev": "07295b9a5a1f1851666269128e95a9644d65107a",
196+
"webdriver_rev": "73a7ac8c0dcb0f84eae47e2133805295176aa972",
197+
"webkit_inspection_protocol_rev": "153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae",
198198
"yaml_rev": "e5984433a2803d5c67ed0abac5891a55040381ee",
199199
"yaml_edit_rev": "54884db790720ac0f7ca491cb9e6d7a0395ad4cb",
200200

pkg/_fe_analyzer_shared/lib/src/macros/executor/builder_impls.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ DeclarationCode _buildFunctionAugmentation(
574574
assert(initializers == null || declaration is ConstructorDeclaration);
575575

576576
return new DeclarationCode.fromParts([
577-
if (docComments != null) docComments,
577+
if (docComments != null) ...[docComments, '\n'],
578578
if (declaration is MethodDeclaration) ' ',
579579
'augment ',
580580
if (declaration is ConstructorDeclaration) ...[

pkg/_fe_analyzer_shared/test/macros/executor/executor_test.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@ class LibraryInfo {
676676
expect(
677677
result.libraryAugmentations.single.debugString().toString(),
678678
equalsIgnoringWhitespace('''
679+
// A comment!
679680
augment String myFunction() {
680681
print('isExternal: false');
681682
print('isGetter: false');
@@ -733,6 +734,7 @@ class LibraryInfo {
733734
expect(
734735
result.libraryAugmentations.single.debugString().toString(),
735736
equalsIgnoringWhitespace('''
737+
// A comment!
736738
augment String get myVariable {
737739
print('isExternal: false');
738740
print('isGetter: true');
@@ -754,6 +756,7 @@ class LibraryInfo {
754756
expect(
755757
result.libraryAugmentations.single.debugString().toString(),
756758
equalsIgnoringWhitespace('''
759+
// A comment!
757760
augment void set myVariable(String value, ) {
758761
print('isExternal: false');
759762
print('isGetter: false');
@@ -1020,6 +1023,7 @@ final fieldDefinitionMatchers = [
10201023

10211024
final methodDefinitionMatchers = [
10221025
equalsIgnoringWhitespace('''
1026+
// A comment!
10231027
augment (String, bool? hello, {String world}) myMethod() {
10241028
print('definingClass: MyClass');
10251029
print('isExternal: false');
@@ -1050,6 +1054,7 @@ final methodDefinitionMatchers = [
10501054

10511055
final mixinMethodDefinitionMatchers = [
10521056
equalsIgnoringWhitespace('''
1057+
// A comment!
10531058
augment (String, bool? hello, {String world}) myMixinMethod() {
10541059
print('definingClass: MyMixin');
10551060
print('isExternal: false');

pkg/_fe_analyzer_shared/test/macros/executor/simple_macro.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ class SimpleMacro
323323
@override
324324
Future<void> buildDefinitionForFunction(
325325
FunctionDeclaration function, FunctionDefinitionBuilder builder) async {
326-
builder.augment(await _buildFunctionAugmentation(function, builder));
326+
builder.augment(await _buildFunctionAugmentation(function, builder),
327+
docComments: CommentCode.fromString('// A comment!'));
327328
}
328329

329330
@override

pkg/front_end/test/fasta/object_supertype_test.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@ import "package:front_end/src/fasta/messages.dart"
2828
import "package:front_end/src/fasta/source/source_loader.dart"
2929
show defaultDartCoreSource;
3030

31-
import "package:front_end/src/fasta/ticker.dart" show Ticker;
32-
33-
import "../../tool/_fasta/entry_points.dart" show CompileTask;
31+
import "package:front_end/src/kernel_generator_impl.dart";
3432

3533
Future<List<DiagnosticMessage>> outline(String objectHeader) async {
36-
final Ticker ticker = new Ticker(isVerbose: false);
3734
final Uri base = Uri.parse("org-dartlang-test:///");
3835

3936
final MemoryFileSystem fs = new MemoryFileSystem(base);
@@ -67,8 +64,7 @@ Future<List<DiagnosticMessage>> outline(String objectHeader) async {
6764
inputs: [Uri.parse("dart:core"), Uri.parse("dart:collection")]));
6865

6966
await context.runInContext<void>((_) async {
70-
CompileTask task = new CompileTask(context, ticker);
71-
await task.buildOutline();
67+
await generateKernelInternal(buildSummary: true);
7268
});
7369
return messages;
7470
}

0 commit comments

Comments
 (0)