From bffecbbf9b28cd831f4537cca599884e8bcd6e52 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Wed, 16 Mar 2011 17:10:04 +0000 Subject: [PATCH] Bug 339931 - Code completion fails in #include statements --- .../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 e99dea5a812..2aa9e2b2ff3 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 @@ -23,6 +23,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceProxy; import org.eclipse.core.resources.IResourceProxyVisitor; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -289,8 +290,10 @@ public class InclusionProposalComputer implements ICompletionProposalComputer { } if (prefixPath.segmentCount() > 0) { IPath parentPath = parent.getFullPath().append(prefixPath); - if (parentPath.segmentCount() > 0) { - parent= parent.getFolder(prefixPath); + if (parentPath.segmentCount() > 1) { + parent = parent.getFolder(prefixPath); + } else if (parentPath.segmentCount() == 1) { + parent = ResourcesPlugin.getWorkspace().getRoot().getProject(parentPath.lastSegment()); } else { return; }