Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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 4c8a67df637..bfafd2278d2 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