Issue 249. Show documentation for highlighted code completion.

editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java

Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java
index 083c266e01e5cde9cc2d638a462051683c5ca9ca..a554089b1ae1221d84d25e5591f11402801a63e0 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/completion/ProposalInfo.java
@@ -13,54 +13,17 @@
  */
 package com.google.dart.tools.ui.internal.text.completion;
 
-import com.google.dart.tools.core.model.DartElement;
-import com.google.dart.tools.core.model.DartModelException;
-import com.google.dart.tools.core.model.Type;
-import com.google.dart.tools.core.model.TypeMember;
-import com.google.dart.tools.ui.DartDoc2HTMLTextReader;
-import com.google.dart.tools.ui.DartDocContentAccess;
-import com.google.dart.tools.ui.DartToolsPlugin;
+import com.google.dart.tools.core.completion.CompletionProposal;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 
-import java.io.IOException;
-import java.io.Reader;
-
 public class ProposalInfo {
+  private final CompletionProposal proposal;
+  private final String comment;
 
-  /**
-   * Gets the reader content as a String
-   */
-  private static String getString(Reader reader) {
-    StringBuffer buf = new StringBuffer();
-    char[] buffer = new char[1024];
-    int count;
-    try {
-      while ((count = reader.read(buffer)) != -1) {
-        buf.append(buffer, 0, count);
-      }
-    } catch (IOException e) {
-      return null;
-    }
-    return buf.toString();
-  }
-
-  private boolean fJavadocResolved = false;
-
-  private String fJavadoc = null;
-
-  protected DartElement fElement;
-
-  public ProposalInfo(Type type) {
-    fElement = type;
-  }
-
-  public ProposalInfo(TypeMember member) {
-    fElement = member;
-  }
-
-  protected ProposalInfo() {
-    fElement = null;
+  public ProposalInfo(CompletionProposal proposal, String comment) {
+    this.proposal = proposal;
+    this.comment = comment;
   }
 
   /**
@@ -71,78 +34,10 @@ public class ProposalInfo {
    * @return the additional info text
    */
   public final String getInfo(IProgressMonitor monitor) {
-    if (!fJavadocResolved) {
-      fJavadocResolved = true;
-      fJavadoc = computeInfo(monitor);
-    }
-    return fJavadoc;
+    return comment;
   }
 
-  public DartElement getJavaElement() throws DartModelException {
-    return fElement;
-  }
-
-  /**
-   * Gets the text for this proposal info formatted as HTML, or <code>null</code> if no text is
-   * available.
-   * 
-   * @param monitor a progress monitor
-   * @return the additional info text
-   */
-  private String computeInfo(IProgressMonitor monitor) {
-    try {
-      final DartElement javaElement = getJavaElement();
-      if (javaElement instanceof TypeMember) {
-        TypeMember member = (TypeMember) javaElement;
-        return extractJavadoc(member, monitor);
-      }
-    } catch (DartModelException e) {
-      DartToolsPlugin.log(e);
-    } catch (IOException e) {
-      DartToolsPlugin.log(e);
-    }
-    return null;
-  }
-
-  /**
-   * Extracts the javadoc for the given <code>IMember</code> and returns it as HTML.
-   * 
-   * @param member the member to get the documentation for
-   * @param monitor a progress monitor
-   * @return the javadoc for <code>member</code> or <code>null</code> if it is not available
-   * @throws DartModelException if accessing the javadoc fails
-   * @throws IOException if reading the javadoc fails
-   */
-  private String extractJavadoc(TypeMember member, IProgressMonitor monitor)
-      throws DartModelException, IOException {
-    if (member != null) {
-      Reader reader = getHTMLContentReader(member, monitor);
-      if (reader != null) {
-        return getString(reader);
-      }
-    }
-    return null;
-  }
-
-  private Reader getHTMLContentReader(TypeMember member, IProgressMonitor monitor)
-      throws DartModelException {
-    Reader contentReader = DartDocContentAccess.getHTMLContentReader(member, true, true);
-    if (contentReader != null) {
-      return contentReader;
-    }
-
-    contentReader = DartDocContentAccess.getContentReader(member, true);
-    if (contentReader != null) {
-      return new DartDoc2HTMLTextReader(contentReader);
-    }
-
-    if (member.getOpenable().getBuffer() == null) {
-      // only if no source available
-      // TODO(devoncarew): this method is only valid for binary elements
-//      String s = member.getAttachedJavadoc(monitor);
-//      if (s != null)
-//        return new StringReader(s);
-    }
-    return null;
+  public CompletionProposal getProposal() {
+    return proposal;
   }
 }