Version 3.4.0-212.0.dev

Merge cea23ff into dev

DEPS

@@ -143,34 +143,34 @@ vars = {
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "a6ad7693555a9add6f98ad6fd94de80d35c89415", # disable tools/rev_sdk_deps.dart
-  "dartdoc_rev": "cec45fbedf85b938670314e5bcdac3fbdde94f99",
+  "dartdoc_rev": "0de8aff3d2feb6fb9fb5ecf5e4f699b3a0ef2c63",
   "ecosystem_rev": "49a3cbb9a2d8acf974b4d616e20c38b59c360a5a",
   "file_rev": "3aa06490bf34bddf04c7ea964a50c177a4ca0de7",
   "fixnum_rev": "570b28adcfbfdd5b8a7230ea1d6ec0f9587493f1",
   "flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
   "glob_rev": "379d60c7cc5c0e9fe7d0d45549ad0b1ca51396c8",
   "html_rev": "327e37a6a4dd46599737ee982f280d73a8f646f7",
-  "http_rev": "470d2c3595c00252f92be21d2bc3d79816d0d8f2",
+  "http_rev": "8d3c64747f9a6d99b29558b6e612dee83db7cdbb",
   "http_multi_server_rev": "ba9d07f3596b24718ddf45c9e071d40879cca565",
   "http_parser_rev": "84db8b029d9b51859a0bb4966859af009f9442e3",
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "json_rpc_2_rev": "639857be892050159f5164c749d7947694976a4a",
-  "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c",
+  "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", #
   "lints_rev": "ead770872e272e25a64315c120950ea8ad5b2509",
   "logging_rev": "cbaf4ee2e59c318d7519edb5381f5fe2a7f69587",
-  "markdown_rev": "dd47c5dea1015aff2037b613fb4964450beaf81c",
+  "markdown_rev": "1ca51664e7b1b7fe789f6be2668c909ce3aea342",
   "matcher_rev": "d954c8d979579b4b46427b0ea1d9c721117c191e",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "mime_rev": "9a168712d6db610c3822617c132daea72d4fd2b5",
   "mockito_rev": "3ef744f8749864f2a036eba60c4203cc8f638949",
   "native_rev": "0901a3323022fdb59657cc2cb00ea5c80a8468a6", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
-  "package_config_rev": "4a7042bb286cf0b41b26e87972bc28bda535f8b9",
+  "package_config_rev": "3d90e6955ef19b7ce4f1b742a06a20ed4260700a",
   "path_rev": "a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4",
   "pool_rev": "c118f69d8a6441a8453bf7d455fd7c79d3ee1497",
   "protobuf_rev": "b7613581d847e1e36e76f0e36db3a412d8fea5b1",
   "pub_rev": "5b5fdd320a3b60a6a00bdd3122f03c6f67a39eeb", # disable tools/rev_sdk_deps.dart
   "pub_semver_rev": "3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16",
-  "shelf_rev": "da6a69ba749aded85a215fba4882fc3964d2c49b",
+  "shelf_rev": "1acbc673326e5b31280184744f2864a8f92c5b46",
   "source_map_stack_trace_rev": "c75649651d01826236e3ab7093d277a70756905a",
   "source_maps_rev": "55e92a4b0a8560d5b2b3bb7255249afdb8186ea6",
   "source_span_rev": "21a403a75b6887fbd811fb53b74b08c2cef67ab6",
@@ -188,13 +188,13 @@ vars = {
   "tools_rev": "fca993e4f287e8080f2a8d91dbfbace8b6a8a0bc",
   "typed_data_rev": "375efaa02a13dad0785cfbd9bdcb9f09aa8ef529",
   "usage_rev": "67ecd7d1328347ec15cbf8d8a46918df75a66af8",
-  "vector_math_rev": "3706feb60f1fb0541dae9cf6b9ef91cd5ea766c6",
+  "vector_math_rev": "7e705f734e94917e9a5347578e6e496f8db38ac6",
   "watcher_rev": "21858a41da1482922e03ee65cdf2169d01d59a67",
-  "web_rev": "8870d04354cd1af4b77aeec6f4abd77a53bcc709",
+  "web_rev": "51e594b35b516b8678825e27e2f2d8051a594a57",
   "web_socket_channel_rev": "3db86bc0a09e1038a0fa418262c8a92211c5de69",
   "webdev_rev": "51b5484348b4a8ede351e8dff0428b083495ba78", # https://github.com/flutter/devtools/issues/7231
-  "webdriver_rev": "2c1b6f8b9d684caf62d72bb327c24f738a4e7455",
-  "webkit_inspection_protocol_rev": "07295b9a5a1f1851666269128e95a9644d65107a",
+  "webdriver_rev": "73a7ac8c0dcb0f84eae47e2133805295176aa972",
+  "webkit_inspection_protocol_rev": "153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae",
   "yaml_rev": "e5984433a2803d5c67ed0abac5891a55040381ee",
   "yaml_edit_rev": "54884db790720ac0f7ca491cb9e6d7a0395ad4cb",
 

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

@@ -574,7 +574,7 @@ DeclarationCode _buildFunctionAugmentation(
   assert(initializers == null || declaration is ConstructorDeclaration);
 
   return new DeclarationCode.fromParts([
-    if (docComments != null) docComments,
+    if (docComments != null) ...[docComments, '\n'],
     if (declaration is MethodDeclaration) '  ',
     'augment ',
     if (declaration is ConstructorDeclaration) ...[

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

@@ -676,6 +676,7 @@ class LibraryInfo {
                 expect(
                     result.libraryAugmentations.single.debugString().toString(),
                     equalsIgnoringWhitespace('''
+                // A comment!
                 augment String myFunction() {
                   print('isExternal: false');
                   print('isGetter: false');
@@ -733,6 +734,7 @@ class LibraryInfo {
                 expect(
                     result.libraryAugmentations.single.debugString().toString(),
                     equalsIgnoringWhitespace('''
+                // A comment!
                 augment String get myVariable {
                   print('isExternal: false');
                   print('isGetter: true');
@@ -754,6 +756,7 @@ class LibraryInfo {
                 expect(
                     result.libraryAugmentations.single.debugString().toString(),
                     equalsIgnoringWhitespace('''
+                // A comment!
                 augment void set myVariable(String value, ) {
                   print('isExternal: false');
                   print('isGetter: false');
@@ -1020,6 +1023,7 @@ final fieldDefinitionMatchers = [
 
 final methodDefinitionMatchers = [
   equalsIgnoringWhitespace('''
+    // A comment!
     augment (String, bool? hello, {String world}) myMethod() {
       print('definingClass: MyClass');
       print('isExternal: false');
@@ -1050,6 +1054,7 @@ final methodDefinitionMatchers = [
 
 final mixinMethodDefinitionMatchers = [
   equalsIgnoringWhitespace('''
+    // A comment!
     augment (String, bool? hello, {String world}) myMixinMethod() {
       print('definingClass: MyMixin');
       print('isExternal: false');

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

@@ -323,7 +323,8 @@ class SimpleMacro
   @override
   Future<void> buildDefinitionForFunction(
       FunctionDeclaration function, FunctionDefinitionBuilder builder) async {
-    builder.augment(await _buildFunctionAugmentation(function, builder));
+    builder.augment(await _buildFunctionAugmentation(function, builder),
+        docComments: CommentCode.fromString('// A comment!'));
   }
 
   @override

pkg/front_end/test/fasta/object_supertype_test.dart

@@ -28,12 +28,9 @@ import "package:front_end/src/fasta/messages.dart"
 import "package:front_end/src/fasta/source/source_loader.dart"
     show defaultDartCoreSource;
 
-import "package:front_end/src/fasta/ticker.dart" show Ticker;
-
-import "../../tool/_fasta/entry_points.dart" show CompileTask;
+import "package:front_end/src/kernel_generator_impl.dart";
 
 Future<List<DiagnosticMessage>> outline(String objectHeader) async {
-  final Ticker ticker = new Ticker(isVerbose: false);
   final Uri base = Uri.parse("org-dartlang-test:///");
 
   final MemoryFileSystem fs = new MemoryFileSystem(base);
@@ -67,8 +64,7 @@ Future<List<DiagnosticMessage>> outline(String objectHeader) async {
       inputs: [Uri.parse("dart:core"), Uri.parse("dart:collection")]));
 
   await context.runInContext<void>((_) async {
-    CompileTask task = new CompileTask(context, ticker);
-    await task.buildOutline();
+    await generateKernelInternal(buildSummary: true);
   });
   return messages;
 }