Skip to content

Commit f717a0e

Browse files
DanTupCommit Queue
authored andcommitted
[analysis_server] Fix line endings in snippets
This removes `useLineEndingsForPlatform=false` from the Snippets tests and updates them to use a shared method that correctly handles normalization of the `expected` result. It turned out that we had bugs here, with the correct line endings not being used, so it also fixes that by passing `eol` to the `ChangeBuilder`s created by the snippet producers. Progress towards #60234 Change-Id: I851fee987dda52f329d110878e10593cbced8c6c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433780 Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 14889cc commit f717a0e

36 files changed

+368
-772
lines changed

pkg/analysis_server/lib/src/services/snippets/dart/class_declaration.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class ClassDeclaration extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

pkg/analysis_server/lib/src/services/snippets/dart/do_statement.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class DoStatement extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ class FlutterStatefulWidget extends FlutterSnippetProducer
2828

2929
@override
3030
Future<Snippet> compute() async {
31-
var builder = ChangeBuilder(session: request.analysisSession);
31+
var builder = ChangeBuilder(
32+
session: request.analysisSession,
33+
eol: utils.endOfLine,
34+
);
3235

3336
// Checked by isValid().
3437
var classStatefulWidget = this.classStatefulWidget!;

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ class FlutterStatefulWidgetWithAnimationController
3535

3636
@override
3737
Future<Snippet> compute() async {
38-
var builder = ChangeBuilder(session: request.analysisSession);
38+
var builder = ChangeBuilder(
39+
session: request.analysisSession,
40+
eol: utils.endOfLine,
41+
);
3942

4043
// Checked by isValid().
4144
var classStatefulWidget = this.classStatefulWidget!;

pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateless_widget.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ class FlutterStatelessWidget extends FlutterSnippetProducer
2828

2929
@override
3030
Future<Snippet> compute() async {
31-
var builder = ChangeBuilder(session: request.analysisSession);
31+
var builder = ChangeBuilder(
32+
session: request.analysisSession,
33+
eol: utils.endOfLine,
34+
);
3235

3336
// Checked by isValid().
3437
var classStatelessWidget = this.classStatelessWidget!;

pkg/analysis_server/lib/src/services/snippets/dart/for_in_statement.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class ForInStatement extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326
var varOrFinal = codeStyleOptions.makeLocalsFinal ? 'final' : 'var';
2427

pkg/analysis_server/lib/src/services/snippets/dart/for_statement.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class ForStatement extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

pkg/analysis_server/lib/src/services/snippets/dart/function_declaration.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class FunctionDeclaration extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

pkg/analysis_server/lib/src/services/snippets/dart/if_else_statement.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class IfElseStatement extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

pkg/analysis_server/lib/src/services/snippets/dart/if_statement.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ class IfStatement extends DartSnippetProducer {
1818

1919
@override
2020
Future<Snippet> compute() async {
21-
var builder = ChangeBuilder(session: request.analysisSession);
21+
var builder = ChangeBuilder(
22+
session: request.analysisSession,
23+
eol: utils.endOfLine,
24+
);
2225
var indent = utils.getLinePrefix(request.offset);
2326

2427
await builder.addDartFileEdit(request.filePath, (builder) {

0 commit comments

Comments
 (0)