Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2016-08-19 15:16:52 +0000
committerDani Megert2016-08-19 15:16:52 +0000
commitc64babf28a88c4b1d504c1fca1e1f27aab766bca (patch)
tree2996cb563848f1b598eafbcbc78084c2bdb6add3
parentf7f50009197a94f7aaac20d5184a287d3c84c0dd (diff)
downloadeclipse.platform.text-c64babf28a88c4b1d504c1fca1e1f27aab766bca.tar.gz
eclipse.platform.text-c64babf28a88c4b1d504c1fca1e1f27aab766bca.tar.xz
eclipse.platform.text-c64babf28a88c4b1d504c1fca1e1f27aab766bca.zip
Fixed bug 499980: [content assist] Potential NPE below
CompletionProposalPopup.computeProposals if no proposals possible
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java2
1 files changed, 2 insertions, 0 deletions
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 1fe869afdec..15dd79b2c46 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
@@ -564,6 +564,8 @@ class CompletionProposalPopup implements IContentAssistListener {
} else {
proposals= fContentAssistant.computeCompletionProposals(fViewer, offset);
}
+ if (proposals == null)
+ return new ICompletionProposal[] {};
if (fSorter != null) {
sortProposals(proposals);
fIsInitialSort= true;

Back to the top