Issue 22593. Quick fix 'import library' for typedefs.

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:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
@@ skipping 1722 matching lines @@
   print(0)
 }
 ''');
     assertHasFix(FixKind.INSERT_SEMICOLON, '''
 main() {
   print(0);
 }
 ''');
   }
 
-  void test_importLibraryPackage_withType() {
+  void test_importLibraryPackage_withClass() {
     _configureMyPkg('''
 library my_lib;
 class Test {}
 ''');
     // try to find a fix
     resolveTestUnit('''
 main() {
   Test test = null;
 }
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
 import 'package:my_pkg/my_lib.dart';
 
 main() {
   Test test = null;
 }
 ''');
   }
 
-  void test_importLibraryPrefix_withTopLevelVariable() {
-    resolveTestUnit('''
-import 'dart:math' as pref;
-main() {
-  print(pref.E);
-  print(PI);
-}
-''');
-    assertHasFix(FixKind.IMPORT_LIBRARY_PREFIX, '''
-import 'dart:math' as pref;
-main() {
-  print(pref.E);
-  print(pref.PI);
-}
-''');
-  }
-
-  void test_importLibraryPrefix_withType() {
+  void test_importLibraryPrefix_withClass() {
     resolveTestUnit('''
 import 'dart:async' as pref;
 main() {
   pref.Stream s = null;
   Future f = null;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_PREFIX, '''
 import 'dart:async' as pref;
 main() {
   pref.Stream s = null;
   pref.Future f = null;
 }
 ''');
   }
 
-  void test_importLibraryProject_withFunction() {
-    addSource('/lib.dart', '''
-library lib;
-myFunction() {}
-''');
+  void test_importLibraryPrefix_withTopLevelVariable() {
     resolveTestUnit('''
+import 'dart:math' as pref;
 main() {
-  myFunction();
+  print(pref.E);
+  print(PI);
 }
 ''');
-    performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
-import 'lib.dart';
-
+    assertHasFix(FixKind.IMPORT_LIBRARY_PREFIX, '''
+import 'dart:math' as pref;
 main() {
-  myFunction();
+  print(pref.E);
+  print(pref.PI);
 }
 ''');
   }
 
-  void test_importLibraryProject_withFunction_unresolvedMethod() {
-    addSource('/lib.dart', '''
-library lib;
-myFunction() {}
-''');
-    resolveTestUnit('''
-class A {
-  main() {
-    myFunction();
-  }
-}
-''');
-    performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
-import 'lib.dart';
-
-class A {
-  main() {
-    myFunction();
-  }
-}
-''');
-  }
-
-  void test_importLibraryProject_withTopLevelVariable() {
-    addSource('/lib.dart', '''
-library lib;
-int MY_VAR = 42;
-''');
-    resolveTestUnit('''
-main() {
-  print(MY_VAR);
-}
-''');
-    performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
-import 'lib.dart';
-
-main() {
-  print(MY_VAR);
-}
-''');
-  }
-
-  void test_importLibraryProject_withType_annotation() {
+  void test_importLibraryProject_withClass_annotation() {
     addSource('/lib.dart', '''
 library lib;
 class Test {
   const Test(int p);
 }
 ''');
     resolveTestUnit('''
 @Test(0)
 main() {
 }
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
 import 'lib.dart';
 
 @Test(0)
 main() {
 }
 ''');
   }
 
-  void test_importLibraryProject_withType_inParentFolder() {
+  void test_importLibraryProject_withClass_inParentFolder() {
     testFile = '/project/bin/test.dart';
     addSource('/project/lib.dart', '''
 library lib;
 class Test {}
 ''');
+    resolveTestUnit('''
+main() {
+  Test t = null;
+}
+''');
+    performAllAnalysisTasks();
+    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
+import '../lib.dart';
+
+main() {
+  Test t = null;
+}
+''');
+  }
+
+  void test_importLibraryProject_withClass_inRelativeFolder() {
+    testFile = '/project/bin/test.dart';
+    addSource('/project/lib/sub/folder/lib.dart', '''
+library lib;
+class Test {}
+''');
+    resolveTestUnit('''
+main() {
+  Test t = null;
+}
+''');
+    performAllAnalysisTasks();
+    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
+import '../lib/sub/folder/lib.dart';
+
+main() {
+  Test t = null;
+}
+''');
+  }
+
+  void test_importLibraryProject_withClass_inSameFolder() {
+    testFile = '/project/bin/test.dart';
+    addSource('/project/bin/lib.dart', '''
+library lib;
+class Test {}
+''');
     resolveTestUnit('''
 main() {
   Test t = null;
 }
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
-import '../lib.dart';
+import 'lib.dart';
 
 main() {
   Test t = null;
 }
 ''');
   }
 
-  void test_importLibraryProject_withType_inRelativeFolder() {
-    testFile = '/project/bin/test.dart';
-    addSource('/project/lib/sub/folder/lib.dart', '''
+  void test_importLibraryProject_withFunction() {
+    addSource('/lib.dart', '''
 library lib;
-class Test {}
+myFunction() {}
 ''');
     resolveTestUnit('''
 main() {
-  Test t = null;
-}
-''');
-    performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
-import '../lib/sub/folder/lib.dart';
-
-main() {
-  Test t = null;
-}
-''');
-  }
-
-  void test_importLibraryProject_withType_inSameFolder() {
-    testFile = '/project/bin/test.dart';
-    addSource('/project/bin/lib.dart', '''
-library lib;
-class Test {}
-''');
-    resolveTestUnit('''
-main() {
-  Test t = null;
+  myFunction();
 }
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
 import 'lib.dart';
 
 main() {
-  Test t = null;
+  myFunction();
 }
 ''');
   }
 
-  void test_importLibrarySdk_withTopLevelVariable() {
+  void test_importLibraryProject_withFunction_unresolvedMethod() {
+    addSource('/lib.dart', '''
+library lib;
+myFunction() {}
+''');
     resolveTestUnit('''
-main() {
-  print(PI);
+class A {
+  main() {
+    myFunction();
+  }
 }
 ''');
     performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
-import 'dart:math';
+    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
+import 'lib.dart';
 
-main() {
-  print(PI);
+class A {
+  main() {
+    myFunction();
+  }
 }
 ''');
   }
 
-  void test_importLibrarySdk_withTopLevelVariable_annotation() {
+  void test_importLibraryProject_withFunctionTypeAlias() {
+    testFile = '/project/bin/test.dart';
+    addSource('/project/bin/lib.dart', '''
+library lib;
+typedef MyFunction();
+''');
     resolveTestUnit('''
-@PI
 main() {
+  MyFunction t = null;
 }
 ''');
     performAllAnalysisTasks();
-    assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
-import 'dart:math';
+    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
+import 'lib.dart';
 
-@PI
 main() {
+  MyFunction t = null;
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_AsExpression() {
+  void test_importLibraryProject_withTopLevelVariable() {
+    addSource('/lib.dart', '''
+library lib;
+int MY_VAR = 42;
+''');
+    resolveTestUnit('''
+main() {
+  print(MY_VAR);
+}
+''');
+    performAllAnalysisTasks();
+    assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
+import 'lib.dart';
+
+main() {
+  print(MY_VAR);
+}
+''');
+  }
+
+  void test_importLibrarySdk_withClass_AsExpression() {
     resolveTestUnit('''
 main(p) {
   p as Future;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main(p) {
   p as Future;
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_invocationTarget() {
+  void test_importLibrarySdk_withClass_invocationTarget() {
     resolveTestUnit('''
 main() {
   Future.wait(null);
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future.wait(null);
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_IsExpression() {
+  void test_importLibrarySdk_withClass_IsExpression() {
     resolveTestUnit('''
 main(p) {
   p is Future;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main(p) {
   p is Future;
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_typeAnnotation() {
+  void test_importLibrarySdk_withClass_typeAnnotation() {
     resolveTestUnit('''
 main() {
   Future f = null;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future f = null;
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_typeAnnotation_PrefixedIdentifier() {
+  void test_importLibrarySdk_withClass_typeAnnotation_PrefixedIdentifier() {
     resolveTestUnit('''
 main() {
   Future.wait;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future.wait;
 }
 ''');
   }
 
-  void test_importLibrarySdk_withType_typeArgument() {
+  void test_importLibrarySdk_withClass_typeArgument() {
     resolveTestUnit('''
 main() {
   List<Future> futures = [];
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   List<Future> futures = [];
 }
 ''');
   }
 
+  void test_importLibrarySdk_withTopLevelVariable() {
+    resolveTestUnit('''
+main() {
+  print(PI);
+}
+''');
+    performAllAnalysisTasks();
+    assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
+import 'dart:math';
+
+main() {
+  print(PI);
+}
+''');
+  }
+
+  void test_importLibrarySdk_withTopLevelVariable_annotation() {
+    resolveTestUnit('''
+@PI
+main() {
+}
+''');
+    performAllAnalysisTasks();
+    assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
+import 'dart:math';
+
+@PI
+main() {
+}
+''');
+  }
+
   void test_importLibraryShow() {
     resolveTestUnit('''
 import 'dart:async' show Stream;
 main() {
   Stream s = null;
   Future f = null;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SHOW, '''
 import 'dart:async' show Future, Stream;
@@ skipping 991 matching lines @@
 
   List<Position> _findResultPositions(List<String> searchStrings) {
     List<Position> positions = <Position>[];
     for (String search in searchStrings) {
       int offset = resultCode.indexOf(search);
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 }