mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-19 22:25:52 +02:00
Code Issues Wiki Activity

Bug 45203. When choosing between equaly good headers prefer previously

Browse source 
included ones.
This commit is contained in:
Sergey Prigogin 2013-08-05 15:38:37 -07:00
parent 2c7eb4ad91
commit bd885106ae
3 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java
View file

@ -104,7 +104,6 @@ public class HeaderSubstitutor {
IncludeInfo includeInfo = fContext.getIncludeForHeaderFile(path);
if (includeInfo == null)
return path;
// TODO(sprigogin): Take fSymbolExportMap into account.
List<IncludeInfo> candidates = new ArrayList<IncludeInfo>();
candidates.add(includeInfo);
IncludeMap[] maps = fIncludeMaps;
@ -125,6 +124,7 @@ public class HeaderSubstitutor {
}
}
IPath firstResolved = null;
IPath firstIncludedPreviously = null;
for (IncludeInfo candidate : candidates) {
IPath header = fContext.resolveInclude(candidate);
if (header != null) {
@ -132,10 +132,13 @@ public class HeaderSubstitutor {
return header;
if (firstResolved == null)
firstResolved = header;
if (firstIncludedPreviously == null && fContext.wasIncludedPreviously(header))
firstIncludedPreviously = header;
}
}
return firstResolved != null ? firstResolved : path;
return firstIncludedPreviously != null ?
firstIncludedPreviously : firstResolved != null ? firstResolved : path;
}
/**

33
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
View file

@ -202,6 +202,16 @@ public class IncludeOrganizer {
createForwardDeclarations(ast, bindingClassifier, typeForwardDeclarations, functionForwardDeclarations,
bindingsToDefine);
IASTPreprocessorIncludeStatement[] existingIncludes = ast.getIncludeDirectives();
for (IASTPreprocessorIncludeStatement include : existingIncludes) {
if (include.isPartOfTranslationUnitFile()) {
String path = include.getPath();
// An empty path means that the include was not resolved.
if (!path.isEmpty())
fContext.addHeaderIncludedPreviously(Path.fromOSString(path));
}
}
HeaderSubstitutor headerSubstitutor = new HeaderSubstitutor(fContext);
// Create the list of header files which have to be included by examining the list of
// bindings which have to be defined.
@ -222,12 +232,12 @@ public class IncludeOrganizer {
updateIncludePrototypes(includePrototypes, prototype);
}
// Put the existing includes into includePrototypes.
IASTPreprocessorIncludeStatement[] existingIncludes = ast.getIncludeDirectives();
for (IASTPreprocessorIncludeStatement include : existingIncludes) {
if (include.isPartOfTranslationUnitFile()) {
String name = new String(include.getName().getSimpleID());
IncludeInfo includeInfo = new IncludeInfo(name, include.isSystemInclude());
String path = include.getPath();
// An empty path means that the include was not resolved.
IPath header = path.isEmpty() ? null : Path.fromOSString(path);
IncludeGroupStyle style =
header != null ? getIncludeStyle(header) : getIncludeStyle(includeInfo);
@ -987,6 +997,7 @@ public class IncludeOrganizer {
// Resolve requests for exported symbols.
for (InclusionRequest request : requests) {
if (!request.isResolved()) {
IPath firstIncludedPreviously = null;
Set<IncludeInfo> exportingHeaders = getExportingHeaders(request, headerSubstitutor);
for (IncludeInfo header : exportingHeaders) {
IPath path = fContext.resolveInclude(header);
@ -999,6 +1010,8 @@ public class IncludeOrganizer {
}
break;
}
if (firstIncludedPreviously == null && fContext.wasIncludedPreviously(path))
firstIncludedPreviously = path;
}
}
if (request.isResolved())
@ -1014,7 +1027,22 @@ public class IncludeOrganizer {
}
break;
}
if (firstIncludedPreviously == null && fContext.wasIncludedPreviously(path))
firstIncludedPreviously = path;
}
if (request.isResolved())
continue;
if (firstIncludedPreviously != null) {
request.resolve(firstIncludedPreviously);
if (DEBUG_HEADER_SUBSTITUTION) {
System.out.println(request.toString() + " (present in old includes)"); //$NON-NLS-1$
}
if (!fContext.isAlreadyIncluded(firstIncludedPreviously))
fContext.addHeaderToInclude(firstIncludedPreviously);
}
if (!request.isResolved()) {
IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
if (header == null)
@ -1022,7 +1050,8 @@ public class IncludeOrganizer {
request.resolve(header);
if (DEBUG_HEADER_SUBSTITUTION) {
System.out.println(request.toString() + " (user's choice)"); //$NON-NLS-1$
System.out.println(request.toString() +
(candidatePaths.size() == 1 ? " (the only choice)" : " (user's choice)")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (!fContext.isAlreadyIncluded(header))
fContext.addHeaderToInclude(header);

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionContext.java
View file

@ -51,6 +51,7 @@ public class InclusionContext {
private final IIndex fIndex;
private final Set<IPath> fHeadersToInclude;
private final Set<IPath> fHeadersAlreadyIncluded;
private final Set<IPath> fHeadersIncludedPreviously;
public InclusionContext(ITranslationUnit tu, IIndex index) {
fTu = tu;
@ -65,6 +66,7 @@ public class InclusionContext {
fInverseIncludeResolutionCache = new HashMap<IPath, IncludeInfo>();
fHeadersToInclude = new HashSet<IPath>();
fHeadersAlreadyIncluded = new HashSet<IPath>();
fHeadersIncludedPreviously = new HashSet<IPath>();
}
public ITranslationUnit getTranslationUnit() {
@ -224,4 +226,12 @@ public class InclusionContext {
public final boolean isIncluded(IPath header) {
return fHeadersAlreadyIncluded.contains(header) || fHeadersToInclude.contains(header);
}
public final void addHeaderIncludedPreviously(IPath header) {
fHeadersIncludedPreviously.add(header);
}
public final boolean wasIncludedPreviously(IPath header) {
return fHeadersIncludedPreviously.contains(header);
}
}