Clean up handling of declared/inferred types in VariableElementForLink

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

 // Copyright (c) 2016, 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.
 
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/link.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../reflective_tests.dart';
 import 'summarize_ast_test.dart';
@@ skipping 77 matching lines @@
 }
 class C<T> extends B<T> {
   Future<T> f() => null;
 }
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     library.libraryCycleForLink.ensureLinked();
     // No assertions--just make sure it doesn't crash.
   }
 
+  void test_baseClass_genericWithStaticFinal() {
+    createLinker('''
+class B<T> {
+  static final int i = 0;
+}
+class C<T> extends B<T> {
+  void f() {}
+}
+''');
+    LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
+    library.libraryCycleForLink.ensureLinked();
+  }
+
   void test_baseClass_withPrivateField() {
     createLinker('''
 class B {
   var _b;
 }
 class C extends B {
   var c;
 }
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
@@ skipping 85 matching lines @@
 class C {
   static var y = x;
 }
 ''');
     expect(
         linker
             .getLibrary(linkerInputs.testDartUri)
             .getContainedName('C')
             .getContainedName('y')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'dynamic');
   }
 
   void test_inferredType_topLevelVariable_dynamic() {
     createLinker('''
 dynamic x = null;
 var y = x;
 ''');
     expect(
         linker
             .getLibrary(linkerInputs.testDartUri)
             .getContainedName('y')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'dynamic');
   }
 
   void test_inferredTypeFromOutsideBuildUnit_dynamic() {
     var bundle = createPackageBundle(
         '''
 var x;
 var y = x; // Inferred type: dynamic
 ''',
         path: '/a.dart');
     addBundle(bundle);
     createLinker('''
 import 'a.dart';
 var z = y; // Inferred type: dynamic
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     expect(
         library
             .getContainedName('z')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'dynamic');
   }
 
   void test_inferredTypeFromOutsideBuildUnit_instanceField() {
     var bundle = createPackageBundle(
         '''
 class C {
   var f = 0; // Inferred type: int
 }
 ''',
         path: '/a.dart');
     addBundle(bundle);
     createLinker('''
 import 'a.dart';
 var x = new C().f; // Inferred type: int
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     expect(
         library
             .getContainedName('x')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'int');
   }
 
+  void test_inferredTypeFromOutsideBuildUnit_instanceField_toInstanceField() {
+    var bundle = createPackageBundle(
+        '''
+class C {
+  var f = 0; // Inferred type: int
+}
+''',
+        path: '/a.dart');
+    addBundle(bundle);
+    createLinker('''
+import 'a.dart';
+class D {
+  var g = new C().f; // Inferred type: int
+}
+''');
+    LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
+    ClassElementForLink_Class classD = library.getContainedName('D');
+    expect(classD.fields[0].inferredType.toString(), 'int');
+  }
+
   void test_inferredTypeFromOutsideBuildUnit_methodParamType_viaGeneric() {
     var bundle = createPackageBundle(
         '''
 class B {
   T f<T>(T t) => t;
 }
 class C extends B {
   f<T>(t) => t; // Inferred param type: T
 }
 ''',
         path: '/a.dart');
     addBundle(bundle);
     createLinker('''
 import 'a.dart';
 var x = new C().f(0); // Inferred type: int
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     expect(
         library
             .getContainedName('x')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'int');
   }
 
   void test_inferredTypeFromOutsideBuildUnit_methodParamType_viaInheritance() {
     var bundle = createPackageBundle(
         '''
 class B {
   void f(int i) {}
@@ skipping 33 matching lines @@
     addBundle(bundle);
     createLinker('''
 import 'a.dart';
 var x = new C().f(); // Inferred type: int
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     expect(
         library
             .getContainedName('x')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'int');
   }
 
   void test_inferredTypeFromOutsideBuildUnit_methodReturnType_viaInheritance() {
     var bundle = createPackageBundle(
         '''
 class B {
   int f() => 0;
@@ skipping 20 matching lines @@
   void test_inferredTypeFromOutsideBuildUnit_staticField() {
     var bundle =
         createPackageBundle('class C { static var f = 0; }', path: '/a.dart');
     addBundle(bundle);
     createLinker('import "a.dart"; var x = C.f;', path: '/b.dart');
     expect(
         linker
             .getLibrary(linkerInputs.testDartUri)
             .getContainedName('x')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'int');
   }
 
   void test_inferredTypeFromOutsideBuildUnit_topLevelVariable() {
     var bundle = createPackageBundle('var a = 0;', path: '/a.dart');
     addBundle(bundle);
     createLinker('import "a.dart"; var b = a;', path: '/b.dart');
     expect(
         linker
             .getLibrary(linkerInputs.testDartUri)
             .getContainedName('b')
             .asTypeInferenceNode
+            .variableElement
             .inferredType
             .toString(),
         'int');
   }
 
   void test_libraryCycle_ignoresDependenciesOutsideBuildUnit() {
     createLinker('import "dart:async";');
     LibraryCycleForLink libraryCycle = testLibrary.libraryCycleForLink;
     expect(libraryCycle.dependencies, isEmpty);
     expect(libraryCycle.libraries, [testLibrary]);
@@ skipping 87 matching lines @@
 class C extends B with I {}
 class D extends C {
   void f() {}
 }
 ''');
     LibraryElementForLink library = linker.getLibrary(linkerInputs.testDartUri);
     library.libraryCycleForLink.ensureLinked();
     // No assertions--just make sure it doesn't crash.
   }
 }