diff options
author | Dawid Pakuła | 2018-05-27 11:18:42 +0000 |
---|---|---|
committer | Dawid Pakuła | 2018-05-27 18:19:38 +0000 |
commit | 7be4af7094d4b262d5f775d8cda380abb9e7aa2f (patch) | |
tree | c53e8de67111ff7d03bcb8771f164d9784f62dbb | |
parent | 1e43b3ba58740f78bbd54f9894dec1d7821c8ac3 (diff) | |
download | eclipse.platform.text-R4_8_maintenance.tar.gz eclipse.platform.text-R4_8_maintenance.tar.xz eclipse.platform.text-R4_8_maintenance.zip |
Bug 535162 - [content assist] Possible NPE during async computeFilteredProposalsS4_8_0_RC4aS4_8_0_RC4S4_8_0_RC3R4_8I20180611-0500I20180607-1630I20180607-0300I20180606-2000I20180606-0800I20180605-2000I20180605-0800I20180605-0430I20180604-2000I20180604-0800I20180603-2000I20180603-0800I20180602-1500I20180602-0800I20180601-2000I20180531-0700I20180530-2000I20180530-0800I20180530-0200I20180530-0035I20180529-2345I20180529-2000I20180529-0800I20180529-0600I20180529-0210I20180528-2020I20180528-2000I20180528-0800R4_8_maintenance
Change-Id: Ib1ea59e69c54811982ee484676be8e77f982fda7
Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java | 2 |
1 files changed, 1 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 26f260d4ac4..4178c78acd7 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 @@ -304,7 +304,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup { @Override protected List<ICompletionProposal> computeFilteredProposals(int offset, DocumentEvent event) { - if(fComputedProposals.size() > 0 && fComputedProposals.get(0) instanceof ComputingProposal) { + if(fComputedProposals != null && fComputedProposals.size() > 0 && fComputedProposals.get(0) instanceof ComputingProposal) { Set<CompletableFuture<List<ICompletionProposal>>> remaining = Collections.synchronizedSet(new HashSet<>(fFutures)); for (CompletableFuture<List<ICompletionProposal>> future : fFutures) { future.thenRun(() -> { |