Roll the latest dart_style into the SDK.

Most of the changes are behind the "--tall-style" experiment flag and
aren't user visible. The couple of minor bug fixes shouldn't affect any
existing code, so this doesn't need to be coordinated with a pre-built
SDK roll.

Change-Id: If74992cd10c0ac22afe158ac2ebfdbefbb6265a3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/383705
Auto-Submit: Bob Nystrom <rnystrom@google.com>
Commit-Queue: Bob Nystrom <rnystrom@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>

CHANGELOG.md

@@ -71,6 +71,12 @@ number, like `.`, `x`, or the `e` in scientific notation.
 
 [#56466]: https://github.com/dart-lang/sdk/issues/56466
 
+#### Dart format
+
+- Preserve type parameters on old-style function-typed formals that also use
+  `this.` or `super.`.
+- Correctly format imports with both `as` and `if` clauses.
+
 #### Wasm compiler (dart2wasm)
 
 - The condition `dart.library.js` is now false on conditional imports in

DEPS

@@ -143,7 +143,7 @@ vars = {
   #   and land the review.
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
-  "dart_style_rev": "f7bd4c42ad6015143f08931540631448048f692d", # disable tools/rev_sdk_deps.dart
+  "dart_style_rev": "003cb15b8d27e4a72eb25dba6f695cd2c7a6f4fb", # disable tools/rev_sdk_deps.dart
   "dartdoc_rev": "b4449742c0f7d7fa0179897cac163388e03236c2",
   "ecosystem_rev": "8626bffad30d08792f0acbc813391800838e8207",
   "file_rev": "855831c242a17c2dee163828d52710d9043c7c8d",

pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline.expect

@@ -3,8 +3,12 @@ class A {
 }
 
 class B extends A {
-  B.sub1(double super.bar1<T1>(int a1),);
-  B.sub2(double super.bar2<T2>(int a2),);
+  B.sub1(
+    double super.bar1<T1>(int a1),
+  );
+  B.sub2(
+    double super.bar2<T2>(int a2),
+  );
 }
 
 main() {}

pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline_modelled.expect

@@ -0,0 +1,14 @@
+class A {
+  A(int foo<T>(int a));
+}
+
+class B extends A {
+  B.sub1(
+    double super.bar1<T1>(int a1),
+  );
+  B.sub2(
+    double super.bar2<T2>(int a2),
+  );
+}
+
+main() {}

pkg/front_end/testcases/textual_outline.status

@@ -5,8 +5,6 @@
 # Status file for the textual_outline_suite.dart test suite. This is testing
 # the textual outline used for better incremental compilation.
 
-super_parameters/issue47741: FormatterCrash # https://github.com/dart-lang/dart_style/issues/1321
-
 # These tests have errors in them which isn't reported by the parser but the
 # formatter still sees as syntax errors and thus won't format.
 extension_types/const_constructor_body: FormatterCrash