From 4889064ff59d88a58ffe516c09f8ef1537a7eb0d Mon Sep 17 00:00:00 2001
From: Kate Lovett <katelovett@google.com>
Date: Fri, 17 Sep 2021 11:07:03 -0500
Subject: [PATCH] Fix the fix (#90217)

---
 packages/flutter/lib/fix_data.yaml            | 64 -------------------
 packages/flutter/test_fixes/material.dart     |  4 ++
 .../flutter/test_fixes/material.dart.expect   |  4 ++
 3 files changed, 8 insertions(+), 64 deletions(-)

diff --git a/packages/flutter/lib/fix_data.yaml b/packages/flutter/lib/fix_data.yaml
index 36bd11f886a..9a89ba51e68 100644
--- a/packages/flutter/lib/fix_data.yaml
+++ b/packages/flutter/lib/fix_data.yaml
@@ -2162,22 +2162,6 @@ transforms:
                   name: 'FloatingLabelBehavior'
           - kind: 'removeParameter'
             name: 'hasFloatingPlaceholder'
-      - if: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-        changes:
-          - kind: 'addParameter'
-            index: 14
-            name: 'floatingLabelBehavior'
-            style: optional_named
-            argumentValue:
-              expression: '{% hasFloatingPlaceholder %} ? {% FloatingLabelBehavior %}.auto : {% FloatingLabelBehavior %}.never'
-              requiredIf: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-              variables:
-                FloatingLabelBehavior:
-                  kind: 'import'
-                  uris: [ 'material.dart' ]
-                  name: 'FloatingLabelBehavior'
-          - kind: 'removeParameter'
-            name: 'hasFloatingPlaceholder'
     variables:
       hasFloatingPlaceholder:
         kind: 'fragment'
@@ -2223,22 +2207,6 @@ transforms:
                   name: 'FloatingLabelBehavior'
           - kind: 'removeParameter'
             name: 'hasFloatingPlaceholder'
-      - if: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-        changes:
-          - kind: 'addParameter'
-            index: 14
-            name: 'floatingLabelBehavior'
-            style: optional_named
-            argumentValue:
-              expression: '{% hasFloatingPlaceholder %} ? {% FloatingLabelBehavior %}.auto : {% FloatingLabelBehavior %}.never'
-              requiredIf: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-              variables:
-                FloatingLabelBehavior:
-                  kind: 'import'
-                  uris: [ 'material.dart' ]
-                  name: 'FloatingLabelBehavior'
-          - kind: 'removeParameter'
-            name: 'hasFloatingPlaceholder'
     variables:
       hasFloatingPlaceholder:
         kind: 'fragment'
@@ -2295,22 +2263,6 @@ transforms:
                   name: 'FloatingLabelBehavior'
           - kind: 'removeParameter'
             name: 'hasFloatingPlaceholder'
-      - if: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-        changes:
-          - kind: 'addParameter'
-            index: 14
-            name: 'floatingLabelBehavior'
-            style: optional_named
-            argumentValue:
-              expression: '{% hasFloatingPlaceholder %} ? {% FloatingLabelBehavior %}.auto : {% FloatingLabelBehavior %}.never'
-              requiredIf: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-              variables:
-                FloatingLabelBehavior:
-                  kind: 'import'
-                  uris: [ 'material.dart' ]
-                  name: 'FloatingLabelBehavior'
-          - kind: 'removeParameter'
-            name: 'hasFloatingPlaceholder'
     variables:
       hasFloatingPlaceholder:
         kind: 'fragment'
@@ -2356,22 +2308,6 @@ transforms:
                   name: 'FloatingLabelBehavior'
           - kind: 'removeParameter'
             name: 'hasFloatingPlaceholder'
-      - if: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-        changes:
-          - kind: 'addParameter'
-            index: 14
-            name: 'floatingLabelBehavior'
-            style: optional_named
-            argumentValue:
-              expression: '{% hasFloatingPlaceholder %} ? {% FloatingLabelBehavior %}.auto : {% FloatingLabelBehavior %}.never'
-              requiredIf: "hasFloatingPlaceholder != 'true' && hasFloatingPlaceholder != 'false'"
-              variables:
-                FloatingLabelBehavior:
-                  kind: 'import'
-                  uris: [ 'material.dart' ]
-                  name: 'FloatingLabelBehavior'
-          - kind: 'removeParameter'
-            name: 'hasFloatingPlaceholder'
     variables:
       hasFloatingPlaceholder:
         kind: 'fragment'
diff --git a/packages/flutter/test_fixes/material.dart b/packages/flutter/test_fixes/material.dart
index 117f3af9c09..1a4961fa447 100644
--- a/packages/flutter/test_fixes/material.dart
+++ b/packages/flutter/test_fixes/material.dart
@@ -189,17 +189,21 @@ void main() {
   const InputDecoration inputDecoration = InputDecoration(hasFloatingPlaceholder: true);
   InputDecoration(hasFloatingPlaceholder: false);
   InputDecoration();
+  InputDecoration(error: '');
   InputDecoration.collapsed(hasFloatingPlaceholder: true);
   InputDecoration.collapsed(hasFloatingPlaceholder: false);
   InputDecoration.collapsed();
+  InputDecoration.collapsed(error: '');
   inputDecoration.hasFloatingPlaceholder;
   const InputDecorationTheme inputDecorationTheme = InputDecorationTheme(hasFloatingPlaceholder: true);
   InputDecorationTheme(hasFloatingPlaceholder: false);
   InputDecorationTheme();
+  InputDecorationTheme(error: '');
   inputDecorationTheme.hasFloatingPlaceholder;
   inputDecorationTheme.copyWith(hasFloatingPlaceholder: false);
   inputDecorationTheme.copyWith(hasFloatingPlaceholder: true);
   inputDecorationTheme.copyWith();
+  inputDecorationTheme.copyWith(error: '');
 
   // Changes made in https://github.com/flutter/flutter/pull/66482
   ThemeData(textSelectionColor: Colors.red);
diff --git a/packages/flutter/test_fixes/material.dart.expect b/packages/flutter/test_fixes/material.dart.expect
index 59100125a09..0764e39e18e 100644
--- a/packages/flutter/test_fixes/material.dart.expect
+++ b/packages/flutter/test_fixes/material.dart.expect
@@ -190,17 +190,21 @@ void main() {
   const InputDecoration inputDecoration = InputDecoration(floatingLabelBehavior: FloatingLabelBehavior.auto);
   InputDecoration(floatingLabelBehavior: FloatingLabelBehavior.never);
   InputDecoration();
+  InputDecoration(error: '');
   InputDecoration.collapsed(floatingLabelBehavior: FloatingLabelBehavior.auto);
   InputDecoration.collapsed(floatingLabelBehavior: FloatingLabelBehavior.never);
   InputDecoration.collapsed();
+  InputDecoration.collapsed(error: '');
   inputDecoration.floatingLabelBehavior;
   const InputDecorationTheme inputDecorationTheme = InputDecorationTheme(floatingLabelBehavior: FloatingLabelBehavior.auto);
   InputDecorationTheme(floatingLabelBehavior: FloatingLabelBehavior.never);
   InputDecorationTheme();
+  InputDecorationTheme(error: '');
   inputDecorationTheme.floatingLabelBehavior;
   inputDecorationTheme.copyWith(floatingLabelBehavior: FloatingLabelBehavior.never);
   inputDecorationTheme.copyWith(floatingLabelBehavior: FloatingLabelBehavior.auto);
   inputDecorationTheme.copyWith();
+  inputDecorationTheme.copyWith(error: '');
 
   // Changes made in https://github.com/flutter/flutter/pull/66482
   ThemeData(textSelectionTheme: TextSelectionThemeData(selectionColor: Colors.red));