Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2017-01-30 12:51:28 +0000
committerMickael Istria2017-04-19 12:23:18 +0000
commit1decb507efc4c69c54a27f5ded7d90c1ee296140 (patch)
tree24abb10eb8c844966d76edaa3a460b4ab64dc5a7
parente1010f3d804f87745414135ba639256fbb8e9284 (diff)
downloadeclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.tar.gz
eclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.tar.xz
eclipse.platform.text-1decb507efc4c69c54a27f5ded7d90c1ee296140.zip
Change-Id: I1e8848a930453d3079363ea33d8c7c2917577b59 Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java9
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/JFaceTextMessages.properties3
2 files changed, 8 insertions, 4 deletions
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 39538bce2..1dafdf5fd 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 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
@Override
public void apply(IDocument document) {
- // Nothing to do
+ // Nothing to do, maybe show some progress report?
}
@Override
@@ -82,12 +82,15 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
@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 543ab27f2..88131ad13 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 @@ ContentAssistant.error_computing_context=Error computing context information.
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.

Back to the top