Fix some EOL bugs + remove useLineEndingsForPlatform=false from refactor tests

Some additional work towards #60234, along with a couple of small fixes for issues uncovered while getting the tests running with \r\n.

Change-Id: Iff3700fad017825f65d64195d844b1694163456a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441840
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: DanTup

pkg/analysis_server/lib/src/cider/rename.dart

@@ -9,6 +9,7 @@ import 'package:analysis_server/src/services/refactoring/legacy/naming_conventio
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/utilities/change_builder.dart';
+import 'package:analysis_server_plugin/edit/correction_utils.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -376,6 +377,7 @@ class CheckNameResponse {
       return null;
     }
 
+    var utils = CorrectionUtils(resolvedUnit);
     var node = result.node;
     if (node is! NamedCompilationUnitMember) {
       return null;
@@ -389,6 +391,7 @@ class CheckNameResponse {
         constructorName: newName,
         isConst: node is EnumDeclaration,
       ),
+      eol: utils.endOfLine,
     );
     if (edit == null) {
       return null;

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

@@ -36,7 +36,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
   final int selectionOffset;
   final int selectionLength;
   late SourceRange selectionRange;
-  late CorrectionUtils utils;
+  final CorrectionUtils utils;
 
   late String name;
   bool extractAll = true;
@@ -62,10 +62,8 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
     this.resolveResult,
     this.selectionOffset,
     this.selectionLength,
-  ) {
-    selectionRange = SourceRange(selectionOffset, selectionLength);
-    utils = CorrectionUtils(resolveResult);
-  }
+  ) : selectionRange = SourceRange(selectionOffset, selectionLength),
+      utils = CorrectionUtils(resolveResult);
 
   CodeStyleOptions get codeStyleOptions =>
       resolveResult.session.analysisContext

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

@@ -34,7 +34,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
   final int offset;
   final int length;
 
-  late CorrectionUtils utils;
+  final CorrectionUtils utils;
 
   ClassElement? classBuildContext;
   ClassElement? classKey;
@@ -76,9 +76,8 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
     this.resolveResult,
     this.offset,
     this.length,
-  ) : sessionHelper = AnalysisSessionHelper(resolveResult.session) {
-    utils = CorrectionUtils(resolveResult);
-  }
+  ) : sessionHelper = AnalysisSessionHelper(resolveResult.session),
+      utils = CorrectionUtils(resolveResult);
 
   @override
   String get refactoringName {

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

@@ -214,7 +214,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
   final ResolvedUnitResult resolveResult;
   final int offset;
   final AnalysisSessionHelper sessionHelper;
-  late CorrectionUtils utils;
+  final CorrectionUtils utils;
   late SourceChange change;
 
   @override
@@ -238,9 +238,8 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     this.searchEngine,
     this.resolveResult,
     this.offset,
-  ) : sessionHelper = AnalysisSessionHelper(resolveResult.session) {
-    utils = CorrectionUtils(resolveResult);
-  }
+  ) : sessionHelper = AnalysisSessionHelper(resolveResult.session),
+      utils = CorrectionUtils(resolveResult);
 
   @override
   String? get className {

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

@@ -483,6 +483,7 @@ abstract class RenameRefactoring implements Refactoring {
       return RenameConstructorRefactoringImpl(
         workspace,
         sessionHelper,
+        resolvedUnit,
         element,
       );
     }

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

@@ -12,7 +12,9 @@ import 'package:analysis_server/src/services/refactoring/legacy/rename.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/utilities/change_builder.dart';
 import 'package:analysis_server/src/utilities/strings.dart';
+import 'package:analysis_server_plugin/edit/correction_utils.dart';
 import 'package:analysis_server_plugin/src/utilities/selection.dart';
+import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/source_range.dart';
@@ -21,11 +23,16 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// A [Refactoring] for renaming [ConstructorElement]s.
 class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
+  final ResolvedUnitResult resolvedUnit;
+  final CorrectionUtils utils;
+
   RenameConstructorRefactoringImpl(
     super.workspace,
     super.sessionHelper,
+    this.resolvedUnit,
     ConstructorElement super.element,
-  ) : super();
+  ) : utils = CorrectionUtils(resolvedUnit),
+      super();
 
   @override
   ConstructorElement get element => super.element as ConstructorElement;
@@ -108,7 +115,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
     _replaceInReferenceFile(
       reference: reference,
       range: range.endLength(classDeclaration.leftBracket, 0),
-      replacement: '\n  $className() : super.$newName();',
+      replacement: '${utils.endOfLine}  $className() : super.$newName();',
     );
   }
 
@@ -220,6 +227,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
         constructorName: newName,
         isConst: node is EnumDeclaration,
       ),
+      eol: utils.endOfLine,
     );
     if (edit == null) {
       return;

pkg/analysis_server/lib/src/utilities/change_builder.dart

@@ -16,8 +16,9 @@ Future<SourceEdit?> buildEditForInsertedConstructor(
   void Function(DartEditBuilder builder) buildEdit, {
   required ResolvedUnitResult resolvedUnit,
   required AnalysisSession session,
+  required String eol,
 }) async {
-  var builder = ChangeBuilder(session: session);
+  var builder = ChangeBuilder(session: session, eol: eol);
   await builder.addDartFileEdit(resolvedUnit.path, (builder) {
     builder.insertConstructor(container, buildEdit);
   });

pkg/analysis_server/test/abstract_context.dart

@@ -2,6 +2,8 @@
 // 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 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
@@ -309,7 +311,7 @@ class AbstractContextTest
   }) {
     for (var fileEdit in sourceChange.edits) {
       var file = getFile(fileEdit.file);
-      buffer.writeln('>>>>>>>>>> ${file.posixPath}');
+      buffer.write('>>>>>>>>>> ${file.posixPath}${Platform.lineTerminator}');
       var current = file.readAsStringSync();
       var updated = SourceEdit.applySequence(current, fileEdit.edits);
       buffer.write(updated);

pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart

@@ -111,6 +111,7 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
   /// Checks that all conditions of [refactoring] are OK and the result of
   /// applying the [Change] to [testUnit] is [expectedCode].
   Future<void> assertSuccessfulRefactoring(String expectedCode) async {
+    expectedCode = normalizeSource(expectedCode);
     await assertRefactoringConditionsOK();
     var change = await refactoring.createChange();
     refactoringChange = change;
@@ -120,6 +121,7 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
   /// Checks that all conditions of [refactoring] are OK, and the computed
   /// [SourceChange] matches the expectations.
   Future<void> assertSuccessfulRefactoring2(String expected) async {
+    expected = normalizeSource(expected);
     await assertRefactoringConditionsOK();
     var change = await refactoring.createChange();
     assertSourceChange(change, expected);
@@ -158,8 +160,6 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
   @override
   void verifyCreatedCollection() {
     super.verifyCreatedCollection();
-    // TODO(dantup): Get these tests passing with either line ending and change this to true.
-    useLineEndingsForPlatform = false;
     var drivers = [driverFor(testFile)];
     searchEngine = SearchEngineImpl(drivers);
     refactoringWorkspace = RefactoringWorkspace(drivers, searchEngine);