Issue 142793249. Never remove directive with unresolved URIs.

Bug: https://buganizer.corp.google.com/issues/142793249
Change-Id: I5ced1bcf4cb5d634f8e11555bb464f10c4bac68c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/121926
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

pkg/analysis_server/lib/src/services/correction/organize_directives.dart

@@ -17,15 +17,14 @@ class DirectiveOrganizer {
   final String initialCode;
   final CompilationUnit unit;
   final List<AnalysisError> errors;
-  final bool removeUnresolved;
   final bool removeUnused;
 
   String code;
   String endOfLine;
   bool hasUnresolvedIdentifierError;
 
   DirectiveOrganizer(this.initialCode, this.unit, this.errors,
-      {this.removeUnresolved = true, this.removeUnused = true}) {
+      {this.removeUnused = true}) {
     this.code = initialCode;
     this.endOfLine = getEOL(code);
     this.hasUnresolvedIdentifierError = errors.any((error) {
@@ -49,18 +48,6 @@ class DirectiveOrganizer {
     return edits;
   }
 
-  bool _isUnresolvedUri(UriBasedDirective directive) {
-    for (AnalysisError error in errors) {
-      ErrorCode errorCode = error.errorCode;
-      if ((errorCode == CompileTimeErrorCode.URI_DOES_NOT_EXIST ||
-              errorCode == CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED) &&
-          directive.uri.offset == error.offset) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   bool _isUnusedImport(UriBasedDirective directive) {
     for (AnalysisError error in errors) {
       if ((error.errorCode == HintCode.DUPLICATE_IMPORT ||
@@ -125,9 +112,6 @@ class DirectiveOrganizer {
       for (_DirectiveInfo directiveInfo in directives) {
         if (!hasUnresolvedIdentifierError) {
           UriBasedDirective directive = directiveInfo.directive;
-          if (removeUnresolved && _isUnresolvedUri(directive)) {
-            continue;
-          }
           if (removeUnused && _isUnusedImport(directive)) {
             continue;
           }

pkg/analysis_server/test/edit/organize_directives_test.dart

@@ -83,6 +83,22 @@ main() {}
     );
   }
 
+  Future test_keep_unresolvedDirectives() {
+    var code = r'''
+import 'dart:noSuchImportSdkLibrary';
+
+import 'package:noSuchImportPackage/andLib.dart';
+
+export 'dart:noSuchExportSdkLibrary';
+
+export 'package:noSuchExportPackage/andLib.dart';
+
+part 'no_such_part.dart';
+''';
+    addTestFile(code);
+    return _assertOrganized(code);
+  }
+
   Future test_OK_remove_duplicateImports_withSamePrefix() {
     addTestFile('''
 library lib;
@@ -105,48 +121,6 @@ main() {
 ''');
   }
 
-  Future test_OK_remove_unresolvedDirectives() {
-    newFile(join(testFolder, 'existing_part1.dart'), content: 'part of lib;');
-    newFile(join(testFolder, 'existing_part2.dart'), content: 'part of lib;');
-    addTestFile('''
-library lib;
-
-export 'dart:noSuchExportSdkLibrary';
-export 'dart:async';
-export 'package:noSuchExportPackage/andLib.dart';
-export 'dart:math';
-
-import 'dart:async';
-import 'dart:noSuchImportSdkLibrary';
-import 'dart:math';
-import 'package:noSuchImportPackage/andLib.dart';
-
-part 'existing_part1.dart';
-part 'no_such_part.dart';
-part 'existing_part2.dart';
-
-main(Future f) {
-  print(PI);
-}
-''');
-    return _assertOrganized(r'''
-library lib;
-
-import 'dart:async';
-import 'dart:math';
-
-export 'dart:async';
-export 'dart:math';
-
-part 'existing_part1.dart';
-part 'existing_part2.dart';
-
-main(Future f) {
-  print(PI);
-}
-''');
-  }
-
   Future test_OK_remove_unusedImports() {
     addTestFile('''
 library lib;

pkg/analysis_server/test/services/correction/organize_directives_test.dart

@@ -61,7 +61,23 @@ import 'dart:async' as async2;
 main() {
   async1.Future f;
   async2.Stream s;
-}''', removeUnresolved: true, removeUnused: true);
+}''', removeUnused: true);
+  }
+
+  test_keep_unresolvedDirectives() async {
+    var code = r'''
+import 'dart:noSuchImportSdkLibrary';
+
+import 'package:noSuchImportPackage/andLib.dart';
+
+export 'dart:noSuchExportSdkLibrary';
+
+export 'package:noSuchExportPackage/andLib.dart';
+
+part 'no_such_part.dart';
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code);
   }
 
   test_remove_duplicateImports() async {
@@ -78,7 +94,7 @@ import 'dart:async';
 
 main() {
   Future f;
-}''', removeUnresolved: true, removeUnused: true);
+}''', removeUnused: true);
   }
 
   test_remove_duplicateImports_differentText_uri() async {
@@ -95,7 +111,7 @@ import 'dart:async' as async;
 
 main() {
   async.Future f;
-}''', removeUnresolved: true, removeUnused: true);
+}''', removeUnused: true);
   }
 
   test_remove_duplicateImports_withSamePrefix() async {
@@ -112,48 +128,7 @@ import 'dart:async' as async;
 
 main() {
   async.Future f;
-}''', removeUnresolved: true, removeUnused: true);
-  }
-
-  test_remove_unresolvedDirectives() async {
-    addSource('/home/test/lib/existing_part1.dart', 'part of lib;');
-    addSource('/home/test/lib/existing_part2.dart', 'part of lib;');
-    await _computeUnitAndErrors(r'''
-library lib;
-
-import 'dart:async';
-import 'dart:noSuchImportSdkLibrary';
-import 'dart:math';
-import 'package:noSuchImportPackage/andLib.dart';
-
-export 'dart:noSuchExportSdkLibrary';
-export 'dart:async';
-export 'package:noSuchExportPackage/andLib.dart';
-export 'dart:math';
-
-part 'existing_part1.dart';
-part 'no_such_part.dart';
-part 'existing_part2.dart';
-
-main() {
-}
-''');
-    // validate change
-    _assertOrganize(r'''
-library lib;
-
-import 'dart:async';
-import 'dart:math';
-
-export 'dart:async';
-export 'dart:math';
-
-part 'existing_part1.dart';
-part 'existing_part2.dart';
-
-main() {
-}
-''', removeUnresolved: true);
+}''', removeUnused: true);
   }
 
   test_remove_unusedImports() async {
@@ -202,7 +177,7 @@ class A {}
 
 main() {
   Future f;
-}''', removeUnresolved: true, removeUnused: true);
+}''', removeUnused: true);
   }
 
   test_remove_unusedImports_hasUnresolvedError() async {
@@ -340,11 +315,10 @@ import 'package:product2.client/entity.dart';
 ''');
   }
 
-  void _assertOrganize(String expectedCode,
-      {bool removeUnresolved = false, bool removeUnused = false}) {
+  void _assertOrganize(String expectedCode, {bool removeUnused = false}) {
     DirectiveOrganizer organizer = new DirectiveOrganizer(
         testCode, testUnit, testErrors,
-        removeUnresolved: removeUnresolved, removeUnused: removeUnused);
+        removeUnused: removeUnused);
     List<SourceEdit> edits = organizer.organize();
     String result = SourceEdit.applySequence(testCode, edits);
     expect(result, expectedCode);