dart2dart Fix type variables rename

tests/compiler/dart2js/unparser_test.dart

 // Copyright (c) 2012, 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('dart:uri');
 #import('parser_helper.dart');
 #import('mock_compiler.dart');
 #import("../../../lib/compiler/compiler.dart");
 #import("../../../lib/compiler/implementation/dart_backend/dart_backend.dart");
 #import("../../../lib/compiler/implementation/elements/elements.dart");
@@ skipping 502 matching lines @@
       (String result) { Expect.equals(expectedResult, result); });
 }
 
 testTypeVariablesAreRenamed() {
   // Somewhat a hack: we require all the references of the identifier
   // to be renamed in the same way for the whole library. Hence
   // if we have a class and type variable with the same name, they
   // both should be renamed.
   var librarySrc = '''
 #library('mylib');
+typedef void MyFunction<T extends num>(T arg);
 class T {}
 class B<T> {}
 class A<T> extends B<T> { T f; }
 ''';
   var mainSrc = '''
 #import('mylib.dart', prefix: 'mylib');
+typedef void MyFunction<T extends num>(T arg);
 class T {}
 class B<T> {}
 class A<T> extends B<T> { T f; }
 
 main() {
+  MyFunction myf1;
+  mylib.MyFunction myf2;
   new A<int>().f;
   new T();
 
   new mylib.A<int>().f;
   new mylib.T();
 }
 ''';
   var expectedResult =
-    'class T{}class B<T>{}class A<T> extends B<T>{T f;}'
-    'class p_T{}class p_B<p_T>{}class p_A<p_T> extends p_B<p_T>{p_T f;}'
-    'main(){new p_A<int>().f; new p_T(); new A<int>().f; new T();}';
+    'typedef void MyFunction<T extends num>(T arg);'
+    'class T{}'
+    'class B<T>{}'
+    'class A<T> extends B<T>{T f;}'
+    'typedef void p_MyFunction<p_T extends num>(p_T arg);'
+    'class p_T{}'
+    'class p_B<p_T>{}'
+    'class p_A<p_T> extends p_B<p_T>{p_T f;}'
+    'main(){p_MyFunction myf1; MyFunction myf2; new p_A<int>().f; '
+        'new p_T(); new A<int>().f; new T();}';
   testDart2DartWithLibrary(mainSrc, librarySrc,
       (String result) { Expect.equals(expectedResult, result); });
 }
 
 testClassTypeArgumentBound() {
   var librarySrc = '''
 #library('mylib');
 
 interface I {}
 class A<T extends I> {}
@@ skipping 66 matching lines @@
   testClassExtendsWithArgs();
   testStaticInvocation();
   testLibraryGetSet();
   testFieldTypeOutput();
   testDefaultClassNamePlaceholder();
   testFactoryRename();
   testTypeVariablesAreRenamed();
   testClassTypeArgumentBound();
   testDoubleMains();
 }