mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Prefer header variants that were parsed in context of a source file.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-17 14:20:42 -07:00
parent ffb7162210
commit d335475bd0
1 changed files with 54 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java
View file

@ -12,6 +12,7 @@
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Warren Paul (Nokia) - Bug 218266 * Warren Paul (Nokia) - Bug 218266
* James Blackburn (Broadcom Corp.) * James Blackburn (Broadcom Corp.)
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.model; package org.eclipse.cdt.internal.core.model;
@ -655,18 +656,26 @@ public class TranslationUnit extends Openable implements ITranslationUnit {
} }
public boolean isHeaderUnit() { public boolean isHeaderUnit() {
return CCorePlugin.CONTENT_TYPE_CHEADER.equals(contentTypeId) return isHeaderContentType(contentTypeId);
|| CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(contentTypeId);
} }
public boolean isSourceUnit() { public boolean isSourceUnit() {
if (isHeaderUnit()) return isSourceContentType(contentTypeId);
}
private static boolean isHeaderContentType(String contentType) {
return CCorePlugin.CONTENT_TYPE_CHEADER.equals(contentType)
|| CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(contentType);
}
private static boolean isSourceContentType(String contentType) {
if (isHeaderContentType(contentType))
return false; return false;
return CCorePlugin.CONTENT_TYPE_CSOURCE.equals(contentTypeId) return CCorePlugin.CONTENT_TYPE_CSOURCE.equals(contentType)
|| CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(contentTypeId) || CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(contentType)
|| CCorePlugin.CONTENT_TYPE_ASMSOURCE.equals(contentTypeId) || CCorePlugin.CONTENT_TYPE_ASMSOURCE.equals(contentType)
|| LanguageManager.getInstance().isContributedContentType(contentTypeId); || LanguageManager.getInstance().isContributedContentType(contentType);
} }
public boolean isCLanguage() { public boolean isCLanguage() {
@ -847,31 +856,27 @@ public class TranslationUnit extends Openable implements ITranslationUnit {
fLanguageOfContext= null; fLanguageOfContext= null;
final IIndexFileLocation ifl = IndexLocationFactory.getIFL(this); final IIndexFileLocation ifl = IndexLocationFactory.getIFL(this);
if (ifl != null) { if (ifl != null) {
IIndexFile best= null; IIndexFile best = null;
int mostContent= -1; IIndexFile contextOfBest = null;
int bestScore= -1;
// Find file variant that has the most content and preferably was parsed in
// context of a source file.
for (int linkageID : CTX_LINKAGES) { for (int linkageID : CTX_LINKAGES) {
for (IIndexFile indexFile : index.getFiles(linkageID, ifl)) { for (IIndexFile indexFile : index.getFiles(linkageID, ifl)) {
int count= indexFile.getMacros().length; int score= indexFile.getMacros().length * 2;
if (count > mostContent) { IIndexFile context= getParsedInContext(indexFile);
mostContent= count; if (isSourceFile(context))
score++;
if (score > bestScore) {
bestScore= score;
best= indexFile; best= indexFile;
contextOfBest = context;
} }
} }
} }
if (best != null) { if (best != null && contextOfBest != best) {
IIndexFile context= best; return new IIndexFile[] { contextOfBest, best };
HashSet<IIndexFile> visited= new HashSet<IIndexFile>();
// Bug 199412, may recurse.
while (visited.add(context)) {
IIndexFile next= getParsedInContext(context);
if (next == null)
break;
context= next;
}
if (context != best) {
return new IIndexFile[] {context, best};
}
} }
} }
} catch (CoreException e) { } catch (CoreException e) {
@ -881,18 +886,35 @@ public class TranslationUnit extends Openable implements ITranslationUnit {
return null; return null;
} }
private IIndexFile getParsedInContext(IIndexFile indexFile) private IIndexFile getParsedInContext(IIndexFile indexFile) throws CoreException {
throws CoreException { HashSet<IIndexFile> visited= new HashSet<IIndexFile>();
IIndexInclude include= indexFile.getParsedInContext(); // Bug 199412, may recurse.
if (include != null) { while (visited.add(indexFile)) {
return include.getIncludedBy(); IIndexInclude include= indexFile.getParsedInContext();
if (include == null)
break;
indexFile = include.getIncludedBy();
} }
return null; return indexFile;
} }
/**
* Returns <code>true</code> if the given file was parsed in a context of a source file.
* @throws CoreException
*/
private boolean isSourceFile(IIndexFile indexFile) throws CoreException {
String path = indexFile.getLocation().getURI().getPath();
IContentType cType = CCorePlugin.getContentType(getCProject().getProject(), path);
if (cType == null)
return false;
return isSourceContentType(cType.getId());
}
private ITranslationUnit getConfigureWith(IIndexFile[] contextToHeader) throws CoreException { private ITranslationUnit getConfigureWith(IIndexFile[] contextToHeader) throws CoreException {
if (contextToHeader != null) { if (contextToHeader != null) {
ITranslationUnit configureWith = CoreModelUtil.findTranslationUnitForLocation(contextToHeader[0].getLocation(), getCProject()); ITranslationUnit configureWith = CoreModelUtil.findTranslationUnitForLocation(
contextToHeader[0].getLocation(), getCProject());
if (configureWith != null) if (configureWith != null)
return configureWith; return configureWith;
} }