mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Fix for 226668: [Content Assist] missing proposals for user includes

Browse source
This commit is contained in:
Anton Leherbauer 2008-04-11 13:41:40 +00:00
parent fa32e66c65
commit c9e25b268b
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java
View file

@ -255,15 +255,9 @@ public class InclusionProposalComputer implements ICompletionProposalComputer {
final String name= file.getName();
if (name.length() >= prefixLength && namePrefix.equalsIgnoreCase(name.substring(0, prefixLength))) {
if (file.isFile()) {
if (isCpp) {
if (CoreModel.isValidCXXHeaderUnitName(project, name)) {
if (CoreModel.isValidCXXHeaderUnitName(project, name) || CoreModel.isValidCHeaderUnitName(project, name)) {
includeFiles.add(prefixPath.append(name).toString());
}
} else {
if (CoreModel.isValidCHeaderUnitName(project, name)) {
includeFiles.add(prefixPath.append(name).toString());
}
}
} else if (file.isDirectory()) {
includeFiles.add(prefixPath.append(name).addTrailingSeparator().toString());
}
@ -303,29 +297,25 @@ public class InclusionProposalComputer implements ICompletionProposalComputer {
final int prefixLength = namePrefix.length();
final IProject project= tu.getCProject().getProject();
parent.accept(new IResourceProxyVisitor() {
boolean fFirstVisit= true;
public boolean visit(IResourceProxy proxy) throws CoreException {
final int type= proxy.getType();
if (type == IResource.PROJECT) {
final String name= proxy.getName();
if (fFirstVisit) {
fFirstVisit= false;
return true;
}
final String name= proxy.getName();
if (name.length() >= prefixLength && namePrefix.equalsIgnoreCase(name.substring(0, prefixLength))) {
if (type == IResource.FILE) {
if (isCpp) {
if (CoreModel.isValidCXXHeaderUnitName(project, name)) {
if (CoreModel.isValidCXXHeaderUnitName(project, name) || CoreModel.isValidCHeaderUnitName(project, name)) {
includeFiles.add(cPrefixPath.append(name).toString());
}
} else {
if (CoreModel.isValidCHeaderUnitName(project, name)) {
includeFiles.add(cPrefixPath.append(name).toString());
}
}
} else if (type == IResource.FOLDER) {
includeFiles.add(cPrefixPath.append(name).addTrailingSeparator().toString());
}
}
return false;
}}, 0);
}}, IResource.DEPTH_ONE);
}
/**