Fix for Quick Fix to import SDK classes.

pkg/analysis_server/lib/src/services/correction/fix_internal.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 analysis_server.src.services.correction.fix_internal;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
 
@@ skipping 28 matching lines @@
 import 'package:analyzer/src/dart/element/ast_provider.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/member.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/inheritance_manager.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error_verifier.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/parser.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
-import 'package:analyzer/src/task/dart.dart';
 import 'package:path/path.dart';
 
 /**
  * A predicate is a one-argument function that returns a boolean value.
  */
 typedef bool ElementPredicate(Element argument);
 
 /**
  * The implementation of [DartFixContext].
  *
@@ skipping 1547 matching lines @@
         }
         // don't add this library again
         alreadyImportedWithPrefix.add(libraryElement.source);
         // update library
         String newShowCode = 'show ${showNames.join(', ')}';
         _addReplaceEdit(
             rf.rangeOffsetEnd(showCombinator), newShowCode, unitLibraryElement);
         _addFix(DartFixKind.IMPORT_LIBRARY_SHOW, [libraryName]);
       }
     }
-    // check SDK libraries
-    {
-      DartSdk sdk = context.sourceFactory.dartSdk;
-      List<SdkLibrary> sdkLibraries = sdk.sdkLibraries;
-      for (SdkLibrary sdkLibrary in sdkLibraries) {
-        SourceFactory sdkSourceFactory = context.sourceFactory;
-        String libraryUri = sdkLibrary.shortName;
-        Source librarySource =
-            sdkSourceFactory.resolveUri(unitSource, libraryUri);
-        // maybe already imported
-        if (alreadyImportedWithPrefix.contains(librarySource)) {
-          continue;
-        }
-        // prepare LibraryElement
-        LibraryElement libraryElement =
-            context.getResult(librarySource, LIBRARY_ELEMENT1);
-        if (libraryElement == null) {
-          continue;
-        }
-        // prepare exported Element
-        Element element = getExportedElement(libraryElement, name);
-        if (element == null) {
-          continue;
-        }
-        if (element is PropertyAccessorElement) {
-          element = (element as PropertyAccessorElement).variable;
-        }
-        if (!elementKinds.contains(element.kind)) {
-          continue;
-        }
-        // add import
-        _addFix_importLibrary(
-            DartFixKind.IMPORT_LIBRARY_SDK, libraryElement.source);
-      }
-    }
-    // check project libraries
+    // Find new top-level declarations.
     {
       List<TopLevelDeclarationInSource> declarations =
           await getTopLevelDeclarations(name);
       for (TopLevelDeclarationInSource declaration in declarations) {
         // Check the kind.
         if (declaration.declaration.kind != kind2) {
           continue;
         }
         // Check the source.
         Source librarySource = declaration.source;
-        if (librarySource.isInSystemLibrary) {
-          continue;
-        }
         if (alreadyImportedWithPrefix.contains(librarySource)) {
           continue;
         }
         // Compute the fix kind.
         FixKind fixKind;
-        if (_isLibSrcPath(librarySource.fullName)) {
+        if (librarySource.isInSystemLibrary) {
+          fixKind = DartFixKind.IMPORT_LIBRARY_SDK;
+        } else if (_isLibSrcPath(librarySource.fullName)) {
           // Bad: non-API.
           fixKind = DartFixKind.IMPORT_LIBRARY_PROJECT3;
         } else if (declaration.isExported) {
           // Ugly: exports.
           fixKind = DartFixKind.IMPORT_LIBRARY_PROJECT2;
         } else {
           // Good: direct declaration.
           fixKind = DartFixKind.IMPORT_LIBRARY_PROJECT1;
         }
         // Add the fix.
@@ skipping 1374 matching lines @@
       }
     }
   }
 
   void _updateList(Iterable<Element> elements) {
     for (Element element in elements) {
       _update(element);
     }
   }
 }