diff --git a/CHANGELOG.md b/CHANGELOG.md index 10e0969c8bd..fafd7a6b225 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/DEPS b/DEPS index e513a48fc4d..0c1aef6b671 100644 --- a/DEPS +++ b/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", diff --git a/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline.expect b/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline.expect index defd6151d16..a2030731fdd 100644 --- a/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline.expect +++ b/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(int a1),); - B.sub2(double super.bar2(int a2),); + B.sub1( + double super.bar1(int a1), + ); + B.sub2( + double super.bar2(int a2), + ); } main() {} diff --git a/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline_modelled.expect new file mode 100644 index 00000000000..a2030731fdd --- /dev/null +++ b/pkg/front_end/testcases/super_parameters/issue47741.dart.textual_outline_modelled.expect @@ -0,0 +1,14 @@ +class A { + A(int foo(int a)); +} + +class B extends A { + B.sub1( + double super.bar1(int a1), + ); + B.sub2( + double super.bar2(int a2), + ); +} + +main() {} diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status index e1d86f03791..b9bf65dbe5a 100644 --- a/pkg/front_end/testcases/textual_outline.status +++ b/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