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

incorrect source lookup fallback when file is not in workspace

Browse source 
Change-Id: I9f7c5f3c46a26053123d28f30a7b8712eb8c9254
This commit is contained in:
Alena Laskavaia 2015-11-25 15:08:14 -05:00 • committed by Elena Laskavaia
parent 04bf520618
commit 9e38beb510
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java
View file

@ -188,7 +188,7 @@ public class SourceUtils {
MappingSourceContainer mapping = new MappingSourceContainer(InternalSourceLookupMessages.SourceUtils_0 + (++mappingCount));
mapping.addMapEntries(new MapEntrySourceContainer[] { new MapEntrySourceContainer(a, d.getDirectory()) });
containers.add(mapping);
}
containers.add(new DirectorySourceContainer(d.getDirectory(), d.searchSubfolders()));
}
@ -200,7 +200,7 @@ public class SourceUtils {
if (container instanceof IMappingSourceContainer) {
return ((IMappingSourceContainer) container).getCompilationPath(sourceName);
}
try {
for (ISourceContainer cont : container.getSourceContainers()) {
IPath path = getCompilationPath(cont, sourceName);
@ -266,7 +266,7 @@ public class SourceUtils {
if (director != null) {
lcProject = getLaunchConfigurationProject(director);
}
if (wfiles.length > 0) {
ResourceLookup.sortFilesByRelevance(wfiles, lcProject);
return updateUnavailableResources(wfiles, lcProject);
@ -280,12 +280,15 @@ public class SourceUtils {
ResourceLookup.sortFilesByRelevance(wfiles, lcProject);
return updateUnavailableResources(wfiles, lcProject);
}
// The file is not already in the workspace so try to create an external translation unit for it.
if (lcProject != null) {
ICProject project = CoreModel.getDefault().create(lcProject);
if (project != null) {
return new ITranslationUnit[] { CoreModel.getDefault().createTranslationUnitFrom(project, URIUtil.toURI(file.getCanonicalPath(), true)) };
ITranslationUnit translationUnit = CoreModel.getDefault().createTranslationUnitFrom(project,
URIUtil.toURI(file.getCanonicalPath(), true));
if (translationUnit != null) // if we failed do not return array with null in it
return new ITranslationUnit[] { translationUnit };
}
}
} catch (IOException e) { // ignore if getCanonicalPath throws
@ -294,24 +297,24 @@ public class SourceUtils {
// If we can't create an ETU then fall back on LocalFileStorage.
return new LocalFileStorage[] { new LocalFileStorage(file) };
}
/**
* Check for IFile to be available in workspace ( see {@link IFile#isAccessible()} ).
* Unavailable resources are replaced with {@link ITranslationUnit}
* Check for IFile to be available in workspace ( see {@link IFile#isAccessible()} ).
* Unavailable resources are replaced with {@link ITranslationUnit}
* @param wfiles
* @param project
* @return
*/
private static Object[] updateUnavailableResources(IFile[] wfiles, IProject project){
// with no projects context we will not be able to create ITranslationUnits
// with no projects context we will not be able to create ITranslationUnits
if (project == null) {
return wfiles;
}
ICProject cProject = CoreModel.getDefault().create(project);
Object[] result = new Object[wfiles.length];
for (int i=0; i< wfiles.length; ++i) {
IFile wkspFile = wfiles[i];
IFile wkspFile = wfiles[i];
if (wkspFile.isAccessible()) {
result[i] = wkspFile;
} else {