From 42fb0b23139c480a05899090813a5f5202e5796c Mon Sep 17 00:00:00 2001 From: Kate Lovett Date: Tue, 18 Apr 2023 13:06:06 -0500 Subject: [PATCH] Fix text theme dart fix cases (#125052) Fixes https://github.com/flutter/flutter/issues/125049 This is blocking the dart roll, dart fix will now fix some invalid code that was in these test cases. These test case files are un-analyzed intentionally because they are by nature samples of broken code. --- .../flutter/test_fixes/material/text_theme.dart | 16 ++++++++-------- .../test_fixes/material/text_theme.dart.expect | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/flutter/test_fixes/material/text_theme.dart b/packages/flutter/test_fixes/material/text_theme.dart index 73bc57e898..c78a4cab68 100644 --- a/packages/flutter/test_fixes/material/text_theme.dart +++ b/packages/flutter/test_fixes/material/text_theme.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; void main() { // Changes made in https://github.com/flutter/flutter/pull/48547 - var TextTheme textTheme = TextTheme( + var textTheme = TextTheme( display4: displayStyle4, display3: displayStyle3, display2: displayStyle2, @@ -21,10 +21,10 @@ void main() { subtitle: subtitleStyle, overline: overlineStyle, ); - var TextTheme textTheme = TextTheme(error: ''); + var errorTextTheme = TextTheme(error: ''); // Changes made in https://github.com/flutter/flutter/pull/48547 - var TextTheme copiedTextTheme = TextTheme.copyWith( + var copiedTextTheme = TextTheme.copyWith( display4: displayStyle4, display3: displayStyle3, display2: displayStyle2, @@ -39,7 +39,7 @@ void main() { subtitle: subtitleStyle, overline: overlineStyle, ); - var TextTheme copiedTextTheme = TextTheme.copyWith(error: ''); + var errorCopiedTextTheme = TextTheme.copyWith(error: ''); // Changes made in https://github.com/flutter/flutter/pull/48547 var style; @@ -58,7 +58,7 @@ void main() { style = textTheme.overline; // Changes made in https://github.com/flutter/flutter/pull/109817 - var TextTheme textTheme = TextTheme( + var anotherTextTheme = TextTheme( headline1: headline1Style, headline2: headline2Style, headline3: headline3Style, @@ -73,10 +73,10 @@ void main() { button: buttonStyle, overline: overlineStyle, ); - var TextTheme textTheme = TextTheme(error: ''); + var anotherErrorTextTheme = TextTheme(error: ''); // Changes made in https://github.com/flutter/flutter/pull/109817 - var TextTheme copiedTextTheme = TextTheme.copyWith( + var anotherCopiedTextTheme = TextTheme.copyWith( headline1: headline1Style, headline2: headline2Style, headline3: headline3Style, @@ -91,7 +91,7 @@ void main() { button: buttonStyle, overline: overlineStyle, ); - var TextTheme copiedTextTheme = TextTheme.copyWith(error: ''); + var anotherErrorCopiedTextTheme = TextTheme.copyWith(error: ''); // Changes made in https://github.com/flutter/flutter/pull/109817 var style; diff --git a/packages/flutter/test_fixes/material/text_theme.dart.expect b/packages/flutter/test_fixes/material/text_theme.dart.expect index a33daecd8d..1d2c3b27e4 100644 --- a/packages/flutter/test_fixes/material/text_theme.dart.expect +++ b/packages/flutter/test_fixes/material/text_theme.dart.expect @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; void main() { // Changes made in https://github.com/flutter/flutter/pull/48547 - var TextTheme textTheme = TextTheme( + var textTheme = TextTheme( displayLarge: displayStyle4, displayMedium: displayStyle3, displaySmall: displayStyle2, @@ -21,10 +21,10 @@ void main() { titleSmall: subtitleStyle, labelSmall: overlineStyle, ); - var TextTheme textTheme = TextTheme(error: ''); + var errorTextTheme = TextTheme(error: ''); // Changes made in https://github.com/flutter/flutter/pull/48547 - var TextTheme copiedTextTheme = TextTheme.copyWith( + var copiedTextTheme = TextTheme.copyWith( displayLarge: displayStyle4, displayMedium: displayStyle3, displaySmall: displayStyle2, @@ -39,7 +39,7 @@ void main() { titleSmall: subtitleStyle, labelSmall: overlineStyle, ); - var TextTheme copiedTextTheme = TextTheme.copyWith(error: ''); + var errorCopiedTextTheme = TextTheme.copyWith(error: ''); // Changes made in https://github.com/flutter/flutter/pull/48547 var style; @@ -58,7 +58,7 @@ void main() { style = textTheme.labelSmall; // Changes made in https://github.com/flutter/flutter/pull/109817 - var TextTheme textTheme = TextTheme( + var anotherTextTheme = TextTheme( displayLarge: headline1Style, displayMedium: headline2Style, displaySmall: headline3Style, @@ -73,10 +73,10 @@ void main() { labelLarge: buttonStyle, labelSmall: overlineStyle, ); - var TextTheme textTheme = TextTheme(error: ''); + var anotherErrorTextTheme = TextTheme(error: ''); // Changes made in https://github.com/flutter/flutter/pull/109817 - var TextTheme copiedTextTheme = TextTheme.copyWith( + var anotherCopiedTextTheme = TextTheme.copyWith( displayLarge: headline1Style, displayMedium: headline2Style, displaySmall: headline3Style, @@ -91,7 +91,7 @@ void main() { labelLarge: buttonStyle, labelSmall: overlineStyle, ); - var TextTheme copiedTextTheme = TextTheme.copyWith(error: ''); + var anotherErrorCopiedTextTheme = TextTheme.copyWith(error: ''); // Changes made in https://github.com/flutter/flutter/pull/109817 var style;