Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2016-08-19 12:33:59 +0000
committerDani Megert2016-08-19 12:33:59 +0000
commit23e01242dfe21800d196e8d805735cd4a23f2f96 (patch)
treec4ce90b9c88a05a5a20ec5df4270b473a865abfa /org.eclipse.jface.text
parent89a815459ef514815d47e2608b3d48fce49125fa (diff)
downloadeclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.tar.gz
eclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.tar.xz
eclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.zip
Fixed bug 499980: Potential NPE below CompletionProposalPopup.computeProposals if no proposals possible
Diffstat (limited to 'org.eclipse.jface.text')
-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 4c8a67df6..bfafd2278 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
@@ -556,6 +556,8 @@ class CompletionProposalPopup implements IContentAssistListener {
proposals= fContentAssistant.computeCompletionProposals(fContentAssistSubjectControl, offset);
} else {
proposals= fContentAssistant.computeCompletionProposals(fViewer, offset);
+ if (proposals == null)
+ return new ICompletionProposal[] {};
}
if (fSorter != null) {
sortProposals(proposals);

Back to the top