From 73dea244cc94dc7dbc00a751b2c3151797f4b836 Mon Sep 17 00:00:00 2001 From: Robert Nystrom Date: Wed, 10 May 2023 21:39:48 +0000 Subject: [PATCH] Roll the latest dart_style into the SDK. This has a few changes. One of them affects code even before Dart 3, though it only touches parameters with metadata on them, which tend to be rare (outside of uses of the freezed package). It may affect code in the SDK repo. The other two are specific records and patterns so won't affect much existing code. But the formatted behavior before these bug fixes looks pretty bad, so if it's not too much risky, I think it's worth cherry picking into the next stable point release. Change-Id: I1e60d251b474b099c5059ffa63ddb260f0ed1318 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/302500 Reviewed-by: Alexander Thomas Reviewed-by: Michael Thomsen Commit-Queue: Bob Nystrom --- CHANGELOG.md | 10 ++++++++++ DEPS | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 346e4e0c64cd..f718cf8b84a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,16 @@ ### Tools +## 3.0.1 + +### Tools + +#### Formatter + +- Don't indent parameters with metadata annotations. +- Don't split before `.` following a record literal. +- Don't split unnecessarily in switch expression cases following comments. + ## 3.0.0 - 2023-05-10 ### Language diff --git a/DEPS b/DEPS index a82ada939499..63565edaf712 100644 --- a/DEPS +++ b/DEPS @@ -132,7 +132,7 @@ vars = { # and land the review. # # For more details, see https://github.com/dart-lang/sdk/issues/30164. - "dart_style_rev": "6c9bc10cf2dc6496b2ce863c8d614aa0781abf90", # disable rev_sdk_deps.dart + "dart_style_rev": "156f5c8c3bfe4e3b8e7adc95f7cf24d9500f11c6", # disable rev_sdk_deps.dart "dartdoc_rev": "d01ddc58600c0d2edbbd953d2074996c36604cfc", "ffi_rev": "7f4acbd7532d94a793452030ff96bfef8cd96b68", "file_rev": "b9051806a1fde54066d080a2a3f00333c7bae415",