Issue 19799. Merge getter/setter pairs into fields when create missing overrides.

pkg/analysis_server/test/services/correction/fix_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 test.services.correction.fix;
 
 import 'package:analysis_server/src/protocol.dart' hide AnalysisError;
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
@@ skipping 481 matching lines @@
 
 class B extends A {
   @override
   Map<aaa.Future, List<aaa.Future>> g(aaa.Future p) {
     // TODO: implement g
   }
 }
 ''');
   }
 
+  void test_createMissingOverrides_mergeToField_getterSetter() {
+    _indexTestUnit('''
+class A {
+  int ma;
+  void mb() {}
+  double mc;
+}
+
+class B implements A {
+}
+''');
+    assertHasFix(FixKind.CREATE_MISSING_OVERRIDES, '''
+class A {
+  int ma;
+  void mb() {}
+  double mc;
+}
+
+class B implements A {
+  int ma;
+
+  double mc;
+
+  @override
+  void mb() {
+    // TODO: implement mb
+  }
+}
+''');
+  }
+
   void test_createMissingOverrides_method() {
     _indexTestUnit('''
 abstract class A {
   m1();
   int m2();
   String m3(int p1, double p2, Map<int, List<String>> p3);
   String m4(p1, p2);
   String m5(p1, [int p2 = 2, int p3, p4 = 4]);
   String m6(p1, {int p2: 2, int p3, p4: 4});
 }
@@ skipping 759 matching lines @@
   'dart:math';
 main() {
 }
 ''');
     assertHasFix(FixKind.REMOVE_UNUSED_IMPORT, '''
 main() {
 }
 ''');
   }
 
-  void test_replaceVarWithDynamic() {
-    checkHasSingleError = false;
-    _indexTestUnit('''
-class A {
-  Map<String, var> m;
-}
-''');
-    assertHasFix(FixKind.REPLACE_VAR_WITH_DYNAMIC, '''
-class A {
-  Map<String, dynamic> m;
-}
-''');
-  }
-
   void test_replaceImportUri_inProject() {
     testFile = '/project/bin/test.dart';
     addSource('/project/foo/bar/lib.dart', '');
     _indexTestUnit('''
 import 'no/matter/lib.dart';
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.REPLACE_IMPORT_URI, '''
 import '../foo/bar/lib.dart';
 ''');
   }
 
   void test_replaceImportUri_package() {
     _configureMyPkg('');
     _indexTestUnit('''
 import 'no/matter/my_lib.dart';
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.REPLACE_IMPORT_URI, '''
 import 'package:my_pkg/my_lib.dart';
 ''');
   }
 
+  void test_replaceVarWithDynamic() {
+    checkHasSingleError = false;
+    _indexTestUnit('''
+class A {
+  Map<String, var> m;
+}
+''');
+    assertHasFix(FixKind.REPLACE_VAR_WITH_DYNAMIC, '''
+class A {
+  Map<String, dynamic> m;
+}
+''');
+  }
+
   void test_replaceWithConstInstanceCreation() {
     _indexTestUnit('''
 class A {
   const A();
 }
 const a = new A();
 ''');
     assertHasFix(FixKind.USE_CONST, '''
 class A {
   const A();
@@ skipping 581 matching lines @@
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 }