Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer)

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

 // Copyright (c) 2015, 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 services.completion.dart.suggestion.builder;
 
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/protocol_server.dart'
     hide Element, ElementKind;
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:path/path.dart' as path;
-import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 
 const String DYNAMIC = 'dynamic';
 
 /**
  * Return a suggestion based upon the given element
  * or `null` if a suggestion is not appropriate for the given element.
  * If the suggestion is not currently in scope, then specify
  * importForSource as the source to which an import should be added.
  */
 CompletionSuggestion createSuggestion(Element element,
@@ skipping 75 matching lines @@
 /**
  * Common mixin for sharing behavior
  */
 abstract class ElementSuggestionBuilder {
   /**
    * A collection of completion suggestions.
    */
   final List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
 
   /**
+   * Return the library in which the completion is requested.
+   */
+  LibraryElement get containingLibrary;
+
+  /**
    * Return the kind of suggestions that should be built.
    */
   CompletionSuggestionKind get kind;
 
   /**
-   * Return the library in which the completion is requested.
-   */
-  LibraryElement get containingLibrary;
-
-  /**
    * Add a suggestion based upon the given element.
    */
   void addSuggestion(Element element,
       {String prefix, int relevance: DART_RELEVANCE_DEFAULT}) {
     if (element.isPrivate) {
       if (element.library != containingLibrary) {
         return;
       }
     }
     if (prefix == null && element.isSynthetic) {
@@ skipping 101 matching lines @@
     }
   }
 
   @override
   visitTopLevelVariableElement(TopLevelVariableElement element) {
     if (!typesOnly) {
       addSuggestion(element);
     }
   }
 }