Uncomment and test fixes for importing libraries.

pkg/analysis_services/lib/src/correction/util.dart

Index: pkg/analysis_services/lib/src/correction/util.dart
diff --git a/pkg/analysis_services/lib/src/correction/util.dart b/pkg/analysis_services/lib/src/correction/util.dart
index b8ccbba1f3d27e59312896f5b6e0c782a7294e67..b83dcae957f5e2bbbcb28098caf60af0a95565af 100644
--- a/pkg/analysis_services/lib/src/correction/util.dart
+++ b/pkg/analysis_services/lib/src/correction/util.dart
@@ -58,6 +58,36 @@ ExecutableElement getEnclosingExecutableElement(AstNode node) {
 
 
 /**
+ * Returns a namespace of the given [ExportElement].
+ */
+Map<String, Element> getExportNamespace(ExportElement exp) {
+  Namespace namespace =
+      new NamespaceBuilder().createExportNamespaceForDirective(exp);
+  return namespace.definedNames;
+}
+
+
+/**
+ * Returns a export namespace of the given [LibraryElement].
+ */
+Map<String, Element> getExportNamespace2(LibraryElement library) {

[Brian Wilkerson, 2014/07/28 18:06:56]

How about getExportNamespaceForDirective and getExportNamespaceForLibrary rather
than getExportNamespace and getExportNamespace2?

[scheglov, 2014/07/28 18:27:28]

Done.

+  Namespace namespace =
+      new NamespaceBuilder().createExportNamespaceForLibrary(library);
+  return namespace.definedNames;
+}
+
+
+/**
+ * Returns an [Element] exported from the given [LibraryElement].
+ */
+Element getExportedElement(LibraryElement library, String name) {
+  if (library == null) {
+    return null;
+  }
+  return getExportNamespace2(library)[name];
+}
+
+/**
  * Returns [getExpressionPrecedence] for the parent of [node],
  * or `0` if the parent node is [ParenthesizedExpression].
  *
@@ -82,7 +112,6 @@ int getExpressionPrecedence(AstNode node) {
   return -1000;
 }
 
-
 /**
  * Returns the namespace of the given [ImportElement].
  */
@@ -113,7 +142,6 @@ Expression getQualifiedPropertyTarget(AstNode node) {
   return null;
 }
 
-
 /**
  * Returns the [String] content of the given [Source].
  */
@@ -324,6 +352,146 @@ class CorrectionUtils {
   }
 
   /**
+   * Returns a [InsertDesc] describing where to insert a new library-related
+   * directive.
+   */
+  CorrectionUtils_InsertDesc get insertDescImport {

[Brian Wilkerson, 2014/07/28 18:06:56]

These getters look like they could take a while. I think the general philosophy
is that getters should be used only when they are about as fast as a field
access, and that methods should be used when they take longer than that. But I
leave it to you to decide.

[scheglov, 2014/07/28 18:27:28]

Thank you, fixed.

+    // analyze directives
+    Directive prevDirective = null;
+    for (Directive directive in unit.directives) {
+      if (directive is LibraryDirective || directive is ImportDirective || directive is ExportDirective) {
+        prevDirective = directive;
+      }
+    }
+    // insert after last library-related directive
+    if (prevDirective != null) {
+      CorrectionUtils_InsertDesc result = new CorrectionUtils_InsertDesc();
+      result.offset = prevDirective.end;
+      String eol = endOfLine;
+      if (prevDirective is LibraryDirective) {
+        result.prefix = "${eol}${eol}";
+      } else {
+        result.prefix = eol;
+      }
+      return result;
+    }
+    // no directives, use "top" location
+    return insertDescTop;
+  }
+
+  /**
+   * Returns a [InsertDesc] describing where to insert a new 'part' directive.
+   */
+  CorrectionUtils_InsertDesc get insertDescPart {
+    // analyze directives
+    Directive prevDirective = null;
+    for (Directive directive in unit.directives) {
+      prevDirective = directive;
+    }
+    // insert after last directive
+    if (prevDirective != null) {
+      CorrectionUtils_InsertDesc result = new CorrectionUtils_InsertDesc();
+      result.offset = prevDirective.end;
+      String eol = endOfLine;
+      if (prevDirective is PartDirective) {
+        result.prefix = eol;
+      } else {
+        result.prefix = "${eol}${eol}";
+      }
+      return result;
+    }
+    // no directives, use "top" location
+    return insertDescTop;
+  }
+
+  /**
+   * Returns a [InsertDesc] describing where to insert a new directive or a
+   * top-level declaration at the top of the file.
+   */
+  CorrectionUtils_InsertDesc get insertDescTop {
+    // skip leading line comments
+    int offset = 0;
+    bool insertEmptyLineBefore = false;
+    bool insertEmptyLineAfter = false;
+    String source = _buffer;
+    // skip hash-bang
+    if (offset < source.length - 2) {
+      String linePrefix = getText2(offset, 2);
+      if (linePrefix == "#!") {
+        insertEmptyLineBefore = true;
+        offset = getLineNext(offset);
+        // skip empty lines to first line comment
+        int emptyOffset = offset;
+        while (emptyOffset < source.length - 2) {
+          int nextLineOffset = getLineNext(emptyOffset);
+          String line = source.substring(emptyOffset, nextLineOffset);
+          if (line.trim().isEmpty) {
+            emptyOffset = nextLineOffset;
+            continue;
+          } else if (line.startsWith("//")) {
+            offset = emptyOffset;
+            break;
+          } else {
+            break;
+          }
+        }
+      }
+    }
+    // skip line comments
+    while (offset < source.length - 2) {
+      String linePrefix = getText2(offset, 2);
+      if (linePrefix == "//") {
+        insertEmptyLineBefore = true;
+        offset = getLineNext(offset);
+      } else {
+        break;
+      }
+    }
+    // determine if empty line is required after
+    int nextLineOffset = getLineNext(offset);
+    String insertLine = source.substring(offset, nextLineOffset);
+    if (!insertLine.trim().isEmpty) {
+      insertEmptyLineAfter = true;
+    }
+    // fill InsertDesc
+    CorrectionUtils_InsertDesc desc = new CorrectionUtils_InsertDesc();
+    desc.offset = offset;
+    if (insertEmptyLineBefore) {
+      desc.prefix = endOfLine;
+    }
+    if (insertEmptyLineAfter) {
+      desc.suffix = endOfLine;
+    }
+    return desc;
+  }
+
+  /**
+   * Returns a start index of the next line after the line which contains the
+   * given index.
+   */
+  int getLineNext(int index) {
+    int length = _buffer.length;
+    // skip to the end of the line
+    while (index < length) {
+      int c = _buffer.codeUnitAt(index);
+      if (c == 0xD || c == 0xA) {
+        break;
+      }
+      index++;
+    }
+    // skip single \r
+    if (index < length && _buffer.codeUnitAt(index) == 0xD) {
+      index++;
+    }
+    // skip single \n
+    if (index < length && _buffer.codeUnitAt(index) == 0xA) {
+      index++;
+    }
+    // done
+    return index;
+  }
+
+  /**
    * Returns the text of the given [AstNode] in the unit.
    */
   String getText(AstNode node) => getText2(node.offset, node.length);
@@ -401,3 +569,13 @@ class CorrectionUtils {
     return null;
   }
 }
+
+
+/**
+ * Describes where to insert new directive or top-level declaration.
+ */
+class CorrectionUtils_InsertDesc {
+  int offset = 0;
+  String prefix = "";
+  String suffix = "";
+}