diff options
2 files changed, 3 insertions, 2 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 a3979ea2dd0..f67612f099d 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 @@ -293,4 +293,5 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup { } return IDocument.DEFAULT_CONTENT_TYPE; } + } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index 92052d43d4f..3161ed5fe1d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -1900,7 +1900,7 @@ class CompletionProposalPopup implements IContentAssistListener { */ void setMessage(String message) { Assert.isNotNull(message); - if (isActive() && fMessageText != null) + if (isActive() && fMessageText != null && !fMessageText.isDisposed()) fMessageText.setText(message + " "); //$NON-NLS-1$ } @@ -1923,7 +1923,7 @@ class CompletionProposalPopup implements IContentAssistListener { * @since 3.2 */ public void setStatusLineVisible(boolean show) { - if (!isActive() || show == (fMessageText != null)) + if (!isActive() || show == (fMessageText != null && !fMessageText.isDisposed())) return; // nothing to do if (show) { |