[analysis_server] Update setState + closure completions to use the correct line endings

+ update completion tests to always use normalized code

Change-Id: If6e2f838f23c8cdbb0590a7e408d51897d8b4a46
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443560
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/services/completion/dart/candidate_suggestion.dart

@@ -81,6 +81,9 @@ final class ClosureSuggestion extends CandidateSuggestion with SuggestionData {
   /// The identation to be used for a multi-line completion.
   final String indent;
 
+  /// The EOL marker to be used for a multi-line completion.
+  final String endOfLine;
+
   /// Initialize a newly created candidate suggestion to suggest a closure that
   /// conforms to the given [functionType].
   ///
@@ -92,6 +95,7 @@ final class ClosureSuggestion extends CandidateSuggestion with SuggestionData {
     required super.matcherScore,
     required this.includeTypes,
     required this.indent,
+    required this.endOfLine,
     this.useBlockStatement = true,
   });
 
@@ -125,10 +129,11 @@ final class ClosureSuggestion extends CandidateSuggestion with SuggestionData {
     int selectionOffset;
     if (useBlockStatement) {
       displayText = '$parametersDisplayString {}';
-      stringBuffer.writeln(' {');
+      stringBuffer.write(' {');
+      stringBuffer.write(endOfLine);
       stringBuffer.write('$indent  ');
       selectionOffset = stringBuffer.length;
-      stringBuffer.writeln();
+      stringBuffer.write(endOfLine);
       stringBuffer.write('$indent}');
     } else {
       displayText = '$parametersDisplayString =>';
@@ -981,11 +986,15 @@ final class SetStateMethodSuggestion extends TypedExecutableSuggestion
   /// The identation to be used for a multi-line completion.
   final String indent;
 
+  /// The EOL marker to be used for a multi-line completion.
+  final String endOfLine;
+
   /// Initialize a newly created candidate suggestion to suggest the [element].
   SetStateMethodSuggestion({
     required this.element,
     required this.referencingInterface,
     required this.indent,
+    required this.endOfLine,
     required super.importData,
     required super.matcherScore,
     required super.replacementRange,
@@ -1011,10 +1020,11 @@ final class SetStateMethodSuggestion extends TypedExecutableSuggestion
     // Build the completion and the selection offset.
     var buffer = StringBuffer();
 
-    buffer.writeln('setState(() {');
+    buffer.write('setState(() {');
+    buffer.write(endOfLine);
     buffer.write('$indent  ');
     var selectionOffset = buffer.length;
-    buffer.writeln();
+    buffer.write(endOfLine);
     buffer.write('$indent});');
     var completion = buffer.toString();
     _data = _Data(completion, selectionOffset, displayText: 'setState(() {});');

pkg/analysis_server/lib/src/services/completion/dart/completion_state.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/services/completion/dart/completion_manager.dart';
 import 'package:analysis_server/src/services/completion/dart/utilities.dart';
 import 'package:analysis_server_plugin/src/utilities/selection.dart';
@@ -11,6 +13,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/utilities/completion_matcher.dart';
+import 'package:analyzer_plugin/src/utilities/extensions/string_extension.dart';
 
 /// The information used to compute the suggestions for a completion request.
 class CompletionState {
@@ -47,6 +50,9 @@ class CompletionState {
     return selection.coveringNode.thisOrAncestorOfType<ClassMember>();
   }
 
+  /// The EOL marker for the completion text.
+  String get endOfLine => request.content.endOfLine ?? Platform.lineTerminator;
+
   /// Indicates if types should be specified whenever possible.
   bool get includeTypes => codeStyleOptions.specifyTypes;
 

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -2058,6 +2058,7 @@ class DeclarationHelper {
             referencingInterface: referencingInterface,
             matcherScore: matcherScore,
             indent: state.indent,
+            endOfLine: state.endOfLine,
             addTypeAnnotation: addTypeAnnotation,
             keyword: keyword,
           );

pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart

@@ -3300,6 +3300,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
         matcherScore: 0.0,
         includeTypes: includeTypes,
         indent: state.indent,
+        endOfLine: state.endOfLine,
       ),
     );
     collector.addSuggestion(
@@ -3310,6 +3311,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
         useBlockStatement: false,
         includeTypes: includeTypes,
         indent: state.indent,
+        endOfLine: state.endOfLine,
       ),
     );
   }