[analysis_server] Fix some additional tests failing on Windows

Change-Id: I4f03ecb28f4e440faecc75bc5a99d8fedd0dc402
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352865
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Keerti Parthasarathy <keertip@google.com>
Commit-Queue: Keerti Parthasarathy <keertip@google.com>

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

diff --git a/pkg/analysis_server/lib/src/services/correction/dart/ignore_diagnostic.dart b/pkg/analysis_server/lib/src/services/correction/dart/ignore_diagnostic.dart
index 4812dfb..e8623a0 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/ignore_diagnostic.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/ignore_diagnostic.dart
@@ -8,6 +8,7 @@
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/ignore_comments/ignore_info.dart';
+import 'package:analyzer/src/test_utilities/platform.dart';
 import 'package:analyzer/src/workspace/blaze.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -153,9 +154,21 @@
         return;
       }
 
-      final edit = editor.edits.single;
+      var edit = editor.edits.single;
+      var replacement = edit.replacement;
 
-      builder.addSimpleInsertion(edit.offset, edit.replacement);
+      // HACK(dantup): The YAML editor currently produces inconsistent line
+      //  endings in edits when the source file contains '\r\n'.
+      // https://github.com/dart-lang/yaml_edit/issues/65
+      var analysisOptionsEol = content.contains('\r')
+          ? '\r\n'
+          : content.contains('\n')
+              ? '\n'
+              : platformEol;
+      replacement =
+          replacement.replaceAll('\r', '').replaceAll('\n', analysisOptionsEol);
+
+      builder.addSimpleInsertion(edit.offset, replacement);
     });
   }
 

pkg/analysis_server/test/analysis/notification_navigation_test.dart

diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
index 4594211..e53bedc 100644
--- a/pkg/analysis_server/test/analysis/notification_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
@@ -418,7 +418,7 @@
 
     await prepareNavigation();
     assertHasRegion('bar');
-    assertHasFileTarget(testFilePath, 83, 3);
+    assertHasFileTarget(convertPath(testFilePath), 83, 3);
   }
 
   Future<void> test_class_augmentation_constructor() async {