Fix resynthesis of variables/fields with implicit types.

pkg/analyzer/test/src/summary/resynthesize_test.dart

 // Copyright (c) 2015, 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.src.serialization.elements_test;
 
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/base.dart';
 import 'package:analyzer/src/summary/format.dart';
@@ skipping 89 matching lines @@
     for (int i = 0; i < resynthesized.constructors.length; i++) {
       compareConstructorElements(
           resynthesized.constructors[i],
           original.constructors[i],
           '$desc constructor ${original.constructors[i].name}');
     }
     expect(resynthesized.accessors.length, original.accessors.length);
     for (int i = 0; i < resynthesized.accessors.length; i++) {
       String name = original.accessors[i].name;
       if (name.endsWith('=')) {
-        comparePropertyAccessorElements(resynthesized.getSetter(name),
-            original.accessors[i], '$desc.${original.accessors[i].name}=');
+        comparePropertyAccessorElements(
+            resynthesized.getSetter(name),
+            original.accessors[i],
+            '$desc setter ${original.accessors[i].name}');
       } else {
-        comparePropertyAccessorElements(resynthesized.getGetter(name),
-            original.accessors[i], '$desc.${original.accessors[i].name}');
+        comparePropertyAccessorElements(
+            resynthesized.getGetter(name),
+            original.accessors[i],
+            '$desc getter ${original.accessors[i].name}');
       }
     }
     expect(resynthesized.methods.length, original.methods.length);
     for (int i = 0; i < resynthesized.methods.length; i++) {
       compareMethodElements(resynthesized.methods[i], original.methods[i],
           '$desc.${original.methods[i].name}');
     }
     compareTypes(resynthesized.type, original.type, desc);
   }
 
   void compareCompilationUnitElements(CompilationUnitElementImpl resynthesized,
       CompilationUnitElementImpl original) {
     compareUriReferencedElements(resynthesized, original, '(compilation unit)');
     expect(resynthesized.source, original.source);
     expect(resynthesized.librarySource, original.librarySource);
     expect(resynthesized.types.length, original.types.length);
     for (int i = 0; i < resynthesized.types.length; i++) {
       compareClassElements(
           resynthesized.types[i], original.types[i], original.types[i].name);
     }
     expect(resynthesized.topLevelVariables.length,
         original.topLevelVariables.length);
     for (int i = 0; i < resynthesized.topLevelVariables.length; i++) {
-      compareTopLevelVariableElements(resynthesized.topLevelVariables[i],
-          original.topLevelVariables[i], original.topLevelVariables[i].name);
+      compareTopLevelVariableElements(
+          resynthesized.topLevelVariables[i],
+          original.topLevelVariables[i],
+          'variable ${original.topLevelVariables[i].name}');
     }
     expect(resynthesized.functions.length, original.functions.length);
     for (int i = 0; i < resynthesized.functions.length; i++) {
       compareFunctionElements(resynthesized.functions[i], original.functions[i],
-          original.functions[i].name);
+          'function ${original.functions[i].name}');
     }
     expect(resynthesized.functionTypeAliases.length,
         original.functionTypeAliases.length);
     for (int i = 0; i < resynthesized.functionTypeAliases.length; i++) {
       compareFunctionTypeAliasElements(
           resynthesized.functionTypeAliases[i],
           original.functionTypeAliases[i],
           original.functionTypeAliases[i].name);
     }
     expect(resynthesized.enums.length, original.enums.length);
     for (int i = 0; i < resynthesized.enums.length; i++) {
       compareClassElements(
           resynthesized.enums[i], original.enums[i], original.enums[i].name);
     }
     expect(resynthesized.accessors.length, original.accessors.length);
     for (int i = 0; i < resynthesized.accessors.length; i++) {
-      comparePropertyAccessorElements(resynthesized.accessors[i],
-          original.accessors[i], original.accessors[i].name);
+      if (original.accessors[i].isGetter) {
+        comparePropertyAccessorElements(resynthesized.accessors[i],
+            original.accessors[i], 'getter ${original.accessors[i].name}');
+      } else {
+        comparePropertyAccessorElements(resynthesized.accessors[i],
+            original.accessors[i], 'setter ${original.accessors[i].name}');
+      }
     }
     // TODO(paulberry): test metadata and offsetToElementMap.
   }
 
   void compareConstructorElements(ConstructorElementImpl resynthesized,
       ConstructorElementImpl original, String desc) {
     compareExecutableElements(resynthesized, original, desc);
     // TODO(paulberry): test redirectedConstructor and constantInitializers
   }
 
@@ skipping 423 matching lines @@
   }
 
   test_class_constructors() {
     checkLibrary('class C { C.foo(); C.bar(); }');
   }
 
   test_class_field_const() {
     checkLibrary('class C { static const int i = 0; }');
   }
 
+  test_class_field_implicit_type() {
+    checkLibrary('class C { var x; }');
+  }
+
   test_class_field_static() {
     checkLibrary('class C { static int i; }');
   }
 
   test_class_fields() {
     checkLibrary('class C { int i; int j; }');
   }
 
   test_class_getter_external() {
     checkLibrary('class C { external int get x; }');
   }
 
+  test_class_getter_implicit_return_type() {
+    checkLibrary('class C { get x => null; }');
+  }
+
   test_class_getter_static() {
     checkLibrary('class C { static int get x => null; }');
   }
 
   test_class_getters() {
     checkLibrary('class C { int get x => null; get y => null; }');
   }
 
   test_class_implicitField_getterFirst() {
     checkLibrary('class C { int get x => 0; void set x(int value) {} }');
@@ skipping 24 matching lines @@
   }
 
   test_class_mixins() {
     checkLibrary('class C extends Object with D, E {} class D {} class E {}');
   }
 
   test_class_setter_external() {
     checkLibrary('class C { external void set x(int value); }');
   }
 
+  test_class_setter_implicit_param_type() {
+    checkLibrary('class C { void set x(value) {} }');
+  }
+
+  test_class_setter_implicit_return_type() {
+    checkLibrary('class C { set x(int value) {} }');
+  }
+
   test_class_setter_static() {
     checkLibrary('class C { static void set x(int value) {} }');
   }
 
   test_class_setters() {
     checkLibrary('class C { void set x(int value) {} set y(value) {} }');
   }
 
   test_class_supertype() {
     checkLibrary('class C extends D {} class D {}');
@@ skipping 402 matching lines @@
   }
 
   test_typedefs() {
     checkLibrary('f() {} g() {}');
   }
 
   test_variable_const() {
     checkLibrary('const int i = 0;');
   }
 
+  test_variable_implicit_type() {
+    checkLibrary('var x;');
+  }
+
   test_variables() {
     checkLibrary('int i; int j;');
   }
 }