Bug 511302 - More explicit message for async content assist Change-Id: I1e8848a930453d3079363ea33d8c7c2917577b59 Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java index 39538bc..1dafdf5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
@@ -62,7 +62,7 @@ @Override public void apply(IDocument document) { - // Nothing to do + // Nothing to do, maybe show some progress report? } @Override @@ -82,12 +82,15 @@ @Override public String getDisplayString() { - return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computing"), Integer.valueOf(fSize - fRemaining), Integer.valueOf(fSize)); //$NON-NLS-1$ + return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computing"), Long.valueOf(Math.round(100. * (fSize - fRemaining)/fSize))); //$NON-NLS-1$ } @Override public String getAdditionalProposalInfo() { - return null; + return NLS.bind(JFaceTextMessages.getString("AsyncCompletionProposalPopup.computingDetails"), new Object[] { //$NON-NLS-1$; + Integer.valueOf(fSize), + Integer.valueOf(fSize - fRemaining), + Integer.valueOf(fRemaining) }); } @Override
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties index 543ab27..88131ad 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties
@@ -21,4 +21,5 @@ CompletionProposalPopup.no_proposals=no proposals CompletionProposalPopup.error_retrieving_proposal=Error retrieving proposal text CompletionProposalPopup.unexpected_error=Unexpected error while retrieving text for a content assistance proposal. -AsyncCompletionProposalPopup.computing=Computing ({0}/{1}) ... +AsyncCompletionProposalPopup.computing=Computing proposals ({0}%) ... +AsyncCompletionProposalPopup.computingDetails={0} completion proposal processors requested.\n{1} completed; {2} pending.