summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDawid Pakuła2018-05-04 14:32:40 -0400
committerDawid Pakuła2018-05-04 14:32:40 -0400
commit814145110c4c24eba2e26965b5c9092d5b80215f (patch)
tree983422eeca1ef7dc11117f6b1fa4e295b1bcc5a3
parent95e1301bd4f658b8cfbd728ef4f504e1c62f6c60 (diff)
downloadeclipse.platform.text-814145110c4c24eba2e26965b5c9092d5b80215f.tar.gz
eclipse.platform.text-814145110c4c24eba2e26965b5c9092d5b80215f.tar.xz
eclipse.platform.text-814145110c4c24eba2e26965b5c9092d5b80215f.zip
Bug 534310 - [content assist] NPE in AsyncCompletionProposalPopup#computeProposalsI20180506-2000I20180506-0800
Change-Id: I8840503fcfd2303658d38dacf45551e36536b8a1 Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java4
1 files changed, 3 insertions, 1 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 071375c2f..a3979ea2d 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
@@ -219,7 +219,9 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
@Override
List<ICompletionProposal> computeProposals(int offset) {
- fProposalShell.dispose();
+ if (fProposalShell != null) {
+ fProposalShell.dispose();
+ }
showProposals(true);
return fComputedProposals;
}