Skip to content

Commit bce3dd4

Browse files
jensjohaCommit Queue
authored andcommitted
[CFE/shared] Make formatting more consistent by specifying DartFormatter.latestShortStyleLanguageVersion
Autogenerated files was formatted with the new style, so if one for instance formatted the file via the IDE or by saying `out/ReleaseX64/dart-sdk/bin/dart format pkg/front_end/lib/` we'd get *a lot* of changes which isn't great. This CL sets the formatter version for the auto-generated files, hopefully avoiding such things. Change-Id: I4f92aafde7c77e7c78179f78bf821979a25ec12c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398884 Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Jens Johansen <[email protected]>
1 parent 0b5e5c6 commit bce3dd4

File tree

380 files changed

+17556
-24924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+17556
-24924
lines changed

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

Lines changed: 197 additions & 235 deletions
Large diffs are not rendered by default.

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

Lines changed: 4282 additions & 3672 deletions
Large diffs are not rendered by default.

pkg/_fe_analyzer_shared/lib/src/metadata/proto.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ class GenericMixinProto extends Proto {
721721
@override
722722
Proto? resolve() {
723723
List<TypeAnnotation>? newTypeArguments =
724-
typeArguments.resolve((a) => a.resolve());
724+
typeArguments.resolve((a) => a.resolve());
725725
return newTypeArguments == null
726726
? null
727727
: new GenericMixinProto(reference, scope, newTypeArguments);

pkg/_fe_analyzer_shared/lib/src/parser/util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,4 @@ double doubleFromToken(Token token, {required bool hasSeparators}) {
283283
text = stripSeparators(text);
284284
}
285285
return double.parse(text);
286-
}
286+
}

pkg/front_end/benchmarks/patterns/generate_datatypes.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ List<Test> tests = [''');
7979
];
8080
''');
8181

82-
String result =
83-
new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
84-
.format(sb.toString());
82+
String result = new DartFormatter(
83+
languageVersion: DartFormatter.latestShortStyleLanguageVersion)
84+
.format(sb.toString());
8585
new File.fromUri(fileUri).writeAsStringSync(result);
8686
}
8787

@@ -218,8 +218,8 @@ class CounterVisitor$size implements Visitor$size<void, Counter> {
218218
}
219219
''');
220220

221-
String result =
222-
new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
223-
.format(sb.toString());
221+
String result = new DartFormatter(
222+
languageVersion: DartFormatter.latestShortStyleLanguageVersion)
223+
.format(sb.toString());
224224
new File.fromUri(fileUri).writeAsStringSync(result);
225225
}

pkg/front_end/benchmarks/patterns/util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class SeriesSet {
242242
}
243243
sb.write(']);');
244244
return new DartFormatter(
245-
languageVersion: DartFormatter.latestLanguageVersion)
245+
languageVersion: DartFormatter.latestShortStyleLanguageVersion)
246246
.format(sb.toString());
247247
}
248248
}

0 commit comments

Comments
 (0)