Version 3.5.0-42.0.dev

Merge 03964bd into dev

DEPS

@@ -120,10 +120,10 @@ vars = {
   # EOL comment after a dependency to disable this and pin it at its current
   # revision.
 
-  "args_rev": "788d93541a578e49f066699e1584bc3ce591c376",
+  "args_rev": "b2e2224a15e5d20c02c6c8ede9236fa03ac9c505",
   "async_rev": "47968047eb9888f74ca0691640821bd55b47e763",
-  "bazel_worker_rev": "8619b92baa9959e55b9fc49d2afcd6dda2ec1c10",
-  "benchmark_harness_rev": "c8a0c8b1883dc16c7558a43cee1c3f4f9a163418",
+  "bazel_worker_rev": "79d2ad13c83d5e0883136503d86ddf60fe665900",
+  "benchmark_harness_rev": "d23112a0e6ea8101854bff608250c7ee1ea52a01",
   "boolean_selector_rev": "24635df68661bb44c1c13fb405562421e24298e5",
   "browser_launcher_rev": "c4b2c81aa9debcce3651eda1b68a9bc5d5adf400",
   "characters_rev": "7633a16a22c626e19ca750223237396315268a06",
@@ -144,18 +144,18 @@ 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": "bf6080c8a12bf3a2f29f517d152bbd5fa1bb0a37",
-  "ecosystem_rev": "5a900ca68466efe8680d3500bc0a6172d07ef5a7",
-  "file_rev": "3aa06490bf34bddf04c7ea964a50c177a4ca0de7",
+  "dartdoc_rev": "28d0dabbcce6e19cb62daea2db7d5d3d87017dfa",
+  "ecosystem_rev": "de03da148fbf75de80ed280b44403dcda6ab629a",
+  "file_rev": "f858c6fe9d1b0167b944aa62dd9b4321036b5238",
   "fixnum_rev": "dec16eb715f70f2fe0ed509da2e118354bea21d8",
   "flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
-  "glob_rev": "379d60c7cc5c0e9fe7d0d45549ad0b1ca51396c8",
+  "glob_rev": "25ee2c20a3c7b93f4096036939a59e40916a3890",
   "html_rev": "5b99b43f71da0c6b0f962244c7f5dfa8ca970fef",
-  "http_rev": "5214f7647ea7a7dd360f12625358bd39f8e6aec0",
-  "http_multi_server_rev": "ba9d07f3596b24718ddf45c9e071d40879cca565",
-  "http_parser_rev": "84db8b029d9b51859a0bb4966859af009f9442e3",
+  "http_rev": "caad9caf5f62fc966c8d1632e4958d60dd43a000",
+  "http_multi_server_rev": "6ce0a137aa20cc12b883a386bb7c0ae677cb3429",
+  "http_parser_rev": "8ffcaec6fedfac5274cfa57e133d47d499bdabc0",
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
-  "json_rpc_2_rev": "639857be892050159f5164c749d7947694976a4a",
+  "json_rpc_2_rev": "1a4c47339a741c7554996e467cf2b8bf515ca5b9",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # manually rolled
   "lints_rev": "df9bcbf6dd8964468d0bfa0b1b7286cf850c1656",
   "logging_rev": "dcaf2498e5ce34b17b48770b4e78c44fc9e63cd3",
@@ -165,35 +165,35 @@ vars = {
   "mime_rev": "0a32241c4fcd077a945949760b287677e4d7aff4",
   "mockito_rev": "3ef744f8749864f2a036eba60c4203cc8f638949",
   "native_rev": "71ada4b5c8001e6b8207ed40331d158e0912cd94", # mosum@ and dacoharkes@ are rolling breaking changes manually while the assets features are in experimental.
-  "package_config_rev": "3d90e6955ef19b7ce4f1b742a06a20ed4260700a",
+  "package_config_rev": "486cc4b29fb361efd1f05cc7e07fb3be4132b139",
   "path_rev": "a7284b9917830c18618b26d396d0f0bffc92bb01",
   "pool_rev": "8055cbb290590e761e1149dfbf7c2283fdd88e4f",
-  "protobuf_rev": "b7613581d847e1e36e76f0e36db3a412d8fea5b1",
+  "protobuf_rev": "ccf104dbc36929c0f8708285d5f3a8fae206343e",
   "pub_rev": "f3b1199fcab37a197f2980bf6b28e421e7bce771", # disable tools/rev_sdk_deps.dart
-  "pub_semver_rev": "3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16",
+  "pub_semver_rev": "7581029bf5346fd5a44b95f4686bba8de7598859",
   "shelf_rev": "68cb8641c3181cc76006887a7e93b9d3a423f590",
   "source_map_stack_trace_rev": "d03fd9b1cc11f2ad61ccc2e71bfd8d2558019a6d",
-  "source_maps_rev": "55e92a4b0a8560d5b2b3bb7255249afdb8186ea6",
-  "source_span_rev": "21a403a75b6887fbd811fb53b74b08c2cef67ab6",
+  "source_maps_rev": "64d07fa98f4689f271c2c239d96d2c349b31662a",
+  "source_span_rev": "45e11a3a0e4b14116911fffc21e2cdc95824e28f",
   "sse_rev": "1ab266ad570134294468225d1c2ffe86338005be",
   "stack_trace_rev": "c39ae6e955a76a2ff183288f051f4eee7a5e94d1",
   "stream_channel_rev": "5f72035464ea675c75982b80db967943a0cfddcb",
   "string_scanner_rev": "8dbfddf9a7e8cdd4978ddd3cdab188cfabc543fd",
   "sync_http_rev": "b849559fedc7c5d19a68950f255b6edde6eec6ef",
   "tar_rev": "6150a0c88d9bd17e3e961593a9a7a9564866e8b4",
   "term_glyph_rev": "2ad48ce95b6e6d001251d55b15719ee113caf802",
-  "test_rev": "2b1ed13ea25c0dfcf112af676533e1daf906a3f0",
+  "test_rev": "14d820f079b55428b472bda36ceb17af87588229",
   "test_descriptor_rev": "b61cfb4479fafd78eb9d365cc2f7cdb43c2aed34",
   "test_process_rev": "94ee46d76f89ebb7d73cef3e23bab288b1e43b50",
   "test_reflective_loader_rev": "d7167a2375d8a0c02c12b960c059a115a777f238",
   "tools_rev": "d86ea23c79d2e9dc622d3376aa80d94fbf30bf60",
   "typed_data_rev": "8c7393cbbbba7a5d38c6772371f92d6b38e433fc",
-  "usage_rev": "67ecd7d1328347ec15cbf8d8a46918df75a66af8",
-  "vector_math_rev": "7e705f734e94917e9a5347578e6e496f8db38ac6",
+  "usage_rev": "09cab899c2759c2e1c84ab49098f58beab3c149f",
+  "vector_math_rev": "43f2a77bb0be812b027a68a11792d563713b42a1",
   "watcher_rev": "1bd2f20d0d924c8422aa2b9afdb165bff4f053c0",
-  "web_rev": "e773de957b289d001c90c6b830e91634e305667d",
+  "web_rev": "3d1b4cbaaf7517cf4f86c8cf8ebe31c67040e08a",
   "web_socket_channel_rev": "ced3a37193f89d5ee95792f342eeb15d3d55d8c1",
-  "webdev_rev": "4067462c8d605266a23c3725948a0314102c95f9",
+  "webdev_rev": "7d0d2d46bf4249e73298ddafa4f323f8609d08da",
   "webdriver_rev": "c80e01e6ce121e55c31e33a31e5d3950023e6bc9",
   "webkit_inspection_protocol_rev": "153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae",
   "yaml_rev": "5a1c4be2437bc4122ccf08a3a0f06a7683e62f30",

pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart

@@ -123,7 +123,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
         .singleOrNull;
     if (debugFillProperties == null) {
       await builder.addDartFileEdit(file, (builder) {
-        builder.addMethodInsertion(classDeclaration, (builder) {
+        builder.insertMethod(classDeclaration, (builder) {
           final declPrefix = utils.oneIndent;
           final bodyPrefix = utils.twoIndents;
 

pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart

@@ -84,7 +84,7 @@ class AddKeyToConstructors extends ResolvedCorrectionProducer {
 
     var canBeConst = _canBeConst(node, constructors);
     await builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(node, (builder) {
+      builder.insertConstructor(node, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         if (canBeConst) {

pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart

@@ -88,7 +88,7 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
     await builder.addDartFileEdit(file, (builder) {
       // TODO(brianwilkerson): Consider inserting the names in order into the
       //  switch statement.
-      builder.addCaseClauseAtEndInsertion(
+      builder.insertCaseClauseAtEnd(
           switchKeyword: statement.switchKeyword,
           rightParenthesis: statement.rightParenthesis,
           leftBracket: statement.leftBracket,

pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart

@@ -39,7 +39,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
       await builder.addDartFileEdit(file, (builder) {
         // TODO(brianwilkerson): Consider inserting the names in order into the
         //  switch statement.
-        builder.addCaseClauseAtEndInsertion(
+        builder.insertCaseClauseAtEnd(
             switchKeyword: node.switchKeyword,
             rightParenthesis: node.rightParenthesis,
             leftBracket: node.leftBracket,

pkg/analysis_server/lib/src/services/correction/dart/add_missing_switch_cases.dart

@@ -61,7 +61,7 @@ class AddMissingSwitchCases extends ResolvedCorrectionProducer {
     final singleIndent = utils.oneIndent;
 
     await builder.addDartFileEdit(file, (builder) {
-      builder.addCaseClauseAtEndInsertion(
+      builder.insertCaseClauseAtEnd(
           switchKeyword: node.switchKeyword,
           rightParenthesis: node.rightParenthesis,
           leftBracket: node.leftBracket,
@@ -86,7 +86,7 @@ class AddMissingSwitchCases extends ResolvedCorrectionProducer {
     final singleIndent = utils.oneIndent;
 
     await builder.addDartFileEdit(file, (builder) {
-      builder.addCaseClauseAtEndInsertion(
+      builder.insertCaseClauseAtEnd(
           switchKeyword: node.switchKeyword,
           rightParenthesis: node.rightParenthesis,
           leftBracket: node.leftBracket,

pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart

@@ -167,7 +167,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     var targetSource = targetElement.source;
     var targetFile = targetSource.fullName;
     await builder.addDartFileEdit(targetFile, (builder) {
-      builder.addConstructorInsertion(targetNode, (builder) {
+      builder.insertConstructor(targetNode, (builder) {
         builder.writeConstructorDeclaration(targetElement.name,
             argumentList: instanceCreation.argumentList);
       });
@@ -185,7 +185,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
   }) async {
     var targetFile = resolvedUnit.file.path;
     await builder.addDartFileEdit(targetFile, (builder) {
-      builder.addConstructorInsertion(unitMember, (builder) {
+      builder.insertConstructor(unitMember, (builder) {
         builder.writeConstructorDeclaration(unitMember.name.lexeme,
             isConst: isConst,
             argumentList: argumentList,

pkg/analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart

@@ -148,7 +148,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
     }
 
     await fixContext.builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(classDeclaration, (builder) {
+      builder.insertConstructor(classDeclaration, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         builder.write('const ');
@@ -177,7 +177,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
     required NamedCompilationUnitMember classDeclaration,
   }) async {
     await fixContext.builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(classDeclaration, (builder) {
+      builder.insertConstructor(classDeclaration, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         builder.write('const ');
@@ -204,7 +204,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
     final fieldsForInitializers = <_Field>[];
 
     await fixContext.builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(containerDeclaration, (builder) {
+      builder.insertConstructor(containerDeclaration, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         if (isConst) {
@@ -266,7 +266,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
     required List<_Field> fields,
   }) async {
     await fixContext.builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(containerDeclaration, (builder) {
+      builder.insertConstructor(containerDeclaration, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         if (isConst) {

pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart

@@ -92,7 +92,7 @@ class _CreateConstructor extends ResolvedCorrectionProducer {
     var requiredNamedParameters =
         _constructor.parameters.where((parameter) => parameter.isRequiredNamed);
     await builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(_targetClass, (builder) {
+      builder.insertConstructor(_targetClass, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         void writeParameters(bool isDefinition) {
@@ -173,7 +173,7 @@ class _CreateConstructor extends ResolvedCorrectionProducer {
     var requiredNamedParameters =
         _constructor.parameters.where((parameter) => parameter.isRequiredNamed);
     await builder.addDartFileEdit(file, (builder) {
-      builder.addConstructorInsertion(_targetClass, (builder) {
+      builder.insertConstructor(_targetClass, (builder) {
         // TODO(srawlins): Replace this block with `writeConstructorDeclaration`
         // and `parameterWriter`.
         void writeParameter(ParameterElement parameter) {

pkg/analysis_server/lib/src/services/correction/dart/create_field.dart

@@ -82,7 +82,7 @@ class CreateField extends CreateFieldOrGetter {
     var targetSource = targetElement.source;
     var targetFile = targetSource.fullName;
     await builder.addDartFileEdit(targetFile, (builder) {
-      builder.addFieldInsertion(targetNode, (builder) {
+      builder.insertField(targetNode, (builder) {
         builder.writeFieldDeclaration(_fieldName,
             isStatic: staticModifier,
             nameGroupName: 'NAME',
@@ -104,7 +104,7 @@ class CreateField extends CreateFieldOrGetter {
     // Add proposal.
     await builder.addDartFileEdit(file, (builder) {
       var fieldType = parameter.type?.type;
-      builder.addFieldInsertion(targetClassNode, (builder) {
+      builder.insertField(targetClassNode, (builder) {
         builder.writeFieldDeclaration(_fieldName,
             nameGroupName: 'NAME', type: fieldType, typeGroupName: 'TYPE');
       });

pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart

@@ -212,7 +212,7 @@ class CreateGetter extends CreateFieldOrGetter {
     // Build method source.
     var targetFile = targetSource.fullName;
     await builder.addDartFileEdit(targetFile, (builder) {
-      builder.addGetterInsertion(
+      builder.insertGetter(
         targetNode,
         (builder) {
           builder.writeGetterDeclaration(_getterName,

pkg/analysis_server/lib/src/services/correction/dart/create_method.dart

@@ -188,7 +188,7 @@ class CreateMethod extends ResolvedCorrectionProducer {
       if (targetNode == null) {
         return;
       }
-      builder.addMethodInsertion(targetNode, (builder) {
+      builder.insertMethod(targetNode, (builder) {
         // Maybe 'static'.
         if (staticModifier) {
           builder.write('static ');

pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart

@@ -98,7 +98,7 @@ class CreateSetter extends ResolvedCorrectionProducer {
     var targetFile = targetSource.fullName;
     _setterName = nameNode.name;
     await builder.addDartFileEdit(targetFile, (builder) {
-      builder.addGetterInsertion(
+      builder.insertGetter(
         targetNode,
         (builder) {
           var parameterTypeNode = climbPropertyAccess(nameNode);

pkg/analysis_server/lib/src/services/correction/util.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'dart:io';
 import 'dart:math';
 
 import 'package:_fe_analyzer_shared/src/scanner/token.dart';
@@ -521,7 +522,7 @@ final class CorrectionUtils {
       : unit = result.unit,
         _buffer = result.content;
 
-  /// Returns the EOL to use for this [CompilationUnit].
+  /// The EOL sequence to use for this [CompilationUnit].
   String get endOfLine {
     var endOfLine = _endOfLine;
     if (endOfLine != null) {
@@ -530,9 +531,13 @@ final class CorrectionUtils {
 
     if (_buffer.contains('\r\n')) {
       return _endOfLine = '\r\n';
-    } else {
+    }
+
+    if (_buffer.contains('\n')) {
       return _endOfLine = '\n';
     }
+
+    return Platform.lineTerminator;
   }
 
   String get oneIndent => _oneIndent;

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart

@@ -108,7 +108,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
   ) async {
     var builder = ChangeBuilder(session: sessionHelper.session);
     await builder.addDartFileEdit(resolvedUnit.path, (builder) {
-      builder.addConstructorInsertion(container, buildEdit);
+      builder.insertConstructor(container, buildEdit);
     });
     var fileEdit = builder.sourceChange.getFileEdit(resolvedUnit.path);
     if (fileEdit == null) {

pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart

@@ -295,10 +295,11 @@ abstract class FixProcessorLintTest extends FixProcessorTest {
 
 /// A base class defining support for writing fix processor tests.
 abstract class FixProcessorTest extends BaseFixProcessorTest {
-  /// Return the kind of fixes being tested by this test class.
+  /// The kind of fixes being tested by this test class.
   FixKind get kind;
 
-  /// Asserts that the resolved compilation unit has a fix which produces [expected] output.
+  /// Asserts that the resolved compilation unit has a fix which produces
+  /// [expected] output.
   Future<void> assertHasFix(String expected,
       {bool Function(AnalysisError)? errorFilter,
       int? length,

pkg/analyzer/lib/src/test_utilities/platform.dart

@@ -4,19 +4,17 @@
 
 import 'dart:io';
 
-/// The EOL character to be used for source code in tests.
-final platformEol = Platform.isWindows ? '\r\n' : '\n';
-
-/// Normalizes content to use platform-specific newlines to ensure that
-/// when running on Windows \r\n is used even though source files are checked
-/// out using \n.
+/// Normalizes content to use platform-specific newlines.
+///
+/// This ensures that when running on Windows, '\r\n' is used, even though
+/// source files are checked out using '\n'.
 String normalizeNewlinesForPlatform(String input) {
-  // Skip normalising for other platforms, as the gitattributes for the SDK
-  // will ensure all files are \n.
+  // Skip normalising for other platforms, as the 'gitattributes' for the Dart
+  // SDK ensures all files are '\n'.
   if (!Platform.isWindows) {
     return input;
   }
 
-  final newlinePattern = RegExp(r'\r?\n'); // either \r\n or \n
-  return input.replaceAll(newlinePattern, platformEol);
+  var newlinePattern = RegExp(r'\r?\n'); // Either '\r\n' or '\n'.
+  return input.replaceAll(newlinePattern, Platform.lineTerminator);
 }

pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart

@@ -398,7 +398,7 @@ class EditBuilderImpl implements EditBuilder {
 
   /// The end-of-line marker used in the file being edited, or `null` if the
   /// default marker should be used.
-  String? _eol;
+  final String? _eol;
 
   /// The buffer in which the content of the edit is being composed.
   final StringBuffer _buffer = StringBuffer();
@@ -411,9 +411,8 @@ class EditBuilderImpl implements EditBuilder {
 
   /// Initialize a newly created builder to build a source edit.
   EditBuilderImpl(this.fileEditBuilder, this.offset, this.length,
-      {this.description}) {
-    _eol = fileEditBuilder.changeBuilder.eol;
-  }
+      {this.description})
+      : _eol = fileEditBuilder.changeBuilder.eol;
 
   /// Create and return an edit representing the replacement of a region of the
   /// file with the accumulated text.