Fix for matching field formal parameters.

pkg/analyzer/test/generated/incremental_resolver_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library engine.incremental_resolver_test;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ skipping 571 matching lines @@
 class T {
   List<int> A;
 }
 ''', r'''
 class T {
   List<String> A;
 }
 ''');
   }
 
+  void test_false_fieldFormalParameter_add() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(field);
+}
+''', r'''
+class A {
+  final field;
+  A(this.field);
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_add_function() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(field(a));
+}
+''', r'''
+class A {
+  final field;
+  A(this.field(a));
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_parameters_add() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(this.field(a));
+}
+''', r'''
+class A {
+  final field;
+  A(this.field(a, b));
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_parameters_remove() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(this.field(a, b));
+}
+''', r'''
+class A {
+  final field;
+  A(this.field(a));
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_parameters_typeEdit() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(this.field(int p));
+}
+''', r'''
+class A {
+  final field;
+  A(this.field(String p));
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_remove_default() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A([this.field = 0]);
+}
+''', r'''
+class A {
+  final field;
+  A([field = 0]);
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_remove_function() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(this.field(a));
+}
+''', r'''
+class A {
+  final field;
+  A(field(a));
+}
+''');
+  }
+
+  void test_false_fieldFormalParameter_remove_normal() {
+    _assertDoesNotMatch(r'''
+class A {
+  final field;
+  A(this.field);
+}
+''', r'''
+class A {
+  final field;
+  A(field);
+}
+''');
+  }
+
   void test_false_fieldFormalParameterElement_wasSimple() {
     _assertDoesNotMatch(r'''
 class A {
   int field;
   A(int field);
 }
 ''', r'''
 class A {
   int field;
   A(this.field);
@@ skipping 1109 matching lines @@
   A(this.field);
 }
 ''', r'''
 class A {
   int field;
   A(this.field);
 }
 ''');
   }
 
+  void test_true_fieldFormalParameter_function() {
+    _assertMatches(r'''
+class A {
+  final field;
+  A(this.field(int a, String b));
+}
+''', r'''
+class A {
+  final field;
+  A(this.field(int a, String b));
+}
+''');
+  }
+
   void test_true_functionTypeAlias_list_reorder() {
     _assertMatches(r'''
 typedef A(int pa);
 typedef B(String pb);
 typedef C(pc);
 ''', r'''
 typedef C(pc);
 typedef A(int pa);
 typedef B(String pb);
 ''');
@@ skipping 1105 matching lines @@
 }
 ''');
     _updateAndValidate(r'''
 main() {
   // edited comment text
   print(0);
 }
 ''');
   }
 
+  void test_endOfLineComment_localFunction_inTopLevelVariable() {
+    _resolveUnit(r'''
+typedef int Binary(one, two, three);
+
+int Global = f((a, b, c) {
+  return 0; // Some comment
+});
+''');
+    _updateAndValidate(r'''
+typedef int Binary(one, two, three);
+
+int Global = f((a, b, c) {
+  return 0; // Some  comment
+});
+''');
+  }
+
   void test_endOfLineComment_outBody_add() {
     _resolveUnit(r'''
 main() {
   Object x;
   x.foo();
 }
 ''');
     _updateAndValidate(r'''
 // 000
 main() {
@@ skipping 29 matching lines @@
 ''');
     _updateAndValidate(r'''
 // 10
 main() {
   Object x;
   x.foo();
 }
 ''', expectedSuccess: false);
   }
 
-  void test_endOfLineComment_localFunction_inTopLevelVariable() {
-    _resolveUnit(r'''
-typedef int Binary(one, two, three);
-
-int Global = f((a, b, c) {
-  return 0; // Some comment
-});
-''');
-    _updateAndValidate(r'''
-typedef int Binary(one, two, three);
-
-int Global = f((a, b, c) {
-  return 0; // Some  comment
-});
-''');
-  }
-
   void test_endOfLineComment_remove() {
     _resolveUnit(r'''
 main() {
   // some comment
   print(0);
 }
 ''');
     _updateAndValidate(r'''
 main() {
   print(0);
@@ skipping 884 matching lines @@
     return ResolutionContextBuilder.contextFor(node, listener).scope;
   }
 }
 
 class _Edit {
   final int offset;
   final int length;
   final String replacement;
   _Edit(this.offset, this.length, this.replacement);
 }