| commit | c64babf28a88c4b1d504c1fca1e1f27aab766bca | [log] [tgz] |
|---|---|---|
| author | Dani Megert <dmegert> | Fri Aug 19 17:16:52 2016 +0200 |
| committer | Dani Megert <dmegert> | Fri Aug 19 17:16:52 2016 +0200 |
| tree | 2996cb563848f1b598eafbcbc78084c2bdb6add3 | |
| parent | f7f50009197a94f7aaac20d5184a287d3c84c0dd [diff] |
Fixed bug 499980: [content assist] Potential NPE below CompletionProposalPopup.computeProposals if no proposals possible
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 1fe869a..15dd79b 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 @@ } else { proposals= fContentAssistant.computeCompletionProposals(fViewer, offset); } + if (proposals == null) + return new ICompletionProposal[] {}; if (fSorter != null) { sortProposals(proposals); fIsInitialSort= true;