Fix for type parameters of a local generic function in a static generic method of a generic class.

pkg/analyzer/test/generated/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 analyzer.test.generated.resolver_test;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
@@ skipping 10235 matching lines @@
     expect(type.typeFormals, isEmpty,
         reason: 'this static method is not generic');
   }
 
   void test_staticMethods_classTypeParameters_genericMethod() {
     AnalysisOptionsImpl options = new AnalysisOptionsImpl();
     options.enableGenericMethods = true;
     resetWithOptions(options);
     String code = r'''
 class C<T> {
-  static void m<S>(S s) => null;
+  static void m<S>(S s) {
+    void f<U>(S s, U u) {}
+    print(f);
+  }
 }
 main() {
   print(C.m);
 }
 ''';
     _resolveTestUnit(code);
-    SimpleIdentifier identifier = _findIdentifier('m);');
-    FunctionTypeImpl type = identifier.staticType;
-    expect(type.toString(), '<S>(S) → void');
-    expect(type.typeParameters, isEmpty,
-        reason: 'static methods should not have type parameters');
-    expect(type.typeArguments, isEmpty,
-        reason: 'static methods should not have type arguments');
-    expect(type.typeFormals.toString(), '[S]');
+    // C - m
+    TypeParameterType typeS;
+    {
+      SimpleIdentifier identifier = _findIdentifier('m);');
+      FunctionTypeImpl type = identifier.staticType;
+      expect(type.toString(), '<S>(S) → void');
+      expect(type.typeParameters, isEmpty,
+          reason: 'static methods should not have type parameters');
+      expect(type.typeArguments, isEmpty,
+          reason: 'static methods should not have type arguments');
+      expect(type.typeFormals.toString(), '[S]');
+      typeS = type.typeFormals[0].type;
 
-    type = type.instantiate([DynamicTypeImpl.instance]);
-    expect(type.toString(), '(dynamic) → void');
-    expect(type.typeParameters.toString(), '[S]');
-    expect(type.typeArguments, [DynamicTypeImpl.instance]);
-    expect(type.typeFormals, isEmpty);
+      type = type.instantiate([DynamicTypeImpl.instance]);
+      expect(type.toString(), '(dynamic) → void');
+      expect(type.typeParameters.toString(), '[S]');
+      expect(type.typeArguments, [DynamicTypeImpl.instance]);
+      expect(type.typeFormals, isEmpty);
+    }
+    // C - m - f
+    {
+      SimpleIdentifier identifier = _findIdentifier('f);');
+      FunctionTypeImpl type = identifier.staticType;
+      expect(type.toString(), '<U>(S, U) → void');
+      expect(type.typeParameters.toString(), '[S]');
+      expect(type.typeArguments.toString(), '[S]');
+      expect(type.typeFormals.toString(), '[U]');
+
+      type = type.instantiate([DynamicTypeImpl.instance]);
+      expect(type.toString(), '(S, dynamic) → void');
+      expect(type.typeParameters.toString(), '[S, U]');
+      expect(type.typeArguments, [typeS, DynamicTypeImpl.instance]);
+      expect(type.typeFormals, isEmpty);
+    }
   }
 }
 
 @reflectiveTest
 class StaticTypeAnalyzerTest extends EngineTestCase {
   /**
    * The error listener to which errors will be reported.
    */
   GatheringErrorListener _listener;
 
@@ skipping 6808 matching lines @@
 
   void _resolveTestUnit(String code) {
     testCode = code;
     testSource = addSource(testCode);
     LibraryElement library = resolve2(testSource);
     assertNoErrors(testSource);
     verify([testSource]);
     testUnit = resolveCompilationUnit(testSource, library);
   }
 }