From 706f09f8858ce7817b081f2b282a1b2d08a00f3e Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 12 Apr 2011 13:56:01 +0000 Subject: [PATCH] Bug 342539 - java.lang.NullPointerException at InclusionProposalComputer.java:188 --- .../ui/text/contentassist/InclusionProposalComputer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java index 2aa9e2b2ff3..1340187ed55 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java @@ -123,6 +123,10 @@ public class InclusionProposalComputer implements ICompletionProposalComputer { if (context.isContextInformationStyle()) { return; } + final ITranslationUnit tu= context.getTranslationUnit(); + if (tu == null) { + return; + } String prefix; boolean angleBrackets= false; prefix = computeIncludePrefix(context); @@ -131,10 +135,9 @@ public class InclusionProposalComputer implements ICompletionProposalComputer { prefix= prefix.substring(1); } IPath prefixPath= new Path(prefix); - final ITranslationUnit tu= context.getTranslationUnit(); String[] potentialIncludes= collectIncludeFiles(tu, prefixPath, angleBrackets); if (potentialIncludes.length > 0) { - IInclude[] includes= context.getTranslationUnit().getIncludes(); + IInclude[] includes= tu.getIncludes(); Set alreadyIncluded= new HashSet(); for (IInclude includeDirective : includes) { alreadyIncluded.add(includeDirective.getElementName());