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

RESOLVED - bug 259372: Error parsers can no longer find filenames for EFS resources

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=259372
This commit is contained in:
Chris Recoskie 2008-12-19 14:37:47 +00:00
parent 416bf3a0e0
commit 602ce8c5f6
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
View file

@ -14,6 +14,7 @@ package org.eclipse.cdt.core;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -258,6 +259,11 @@ public class ErrorParserManager extends OutputStream {
matchingFile = file; matchingFile = file;
} }
} }
if(matchingFile == null) {
return (IFile) fFilesInProject.get(path.lastSegment()); // last ditch attempt... look for a file with that name in the project
}
return matchingFile; return matchingFile;
} }
@ -270,7 +276,28 @@ public class ErrorParserManager extends OutputStream {
private static boolean isPossibleMatch(IPath location, IResource resource) { private static boolean isPossibleMatch(IPath location, IResource resource) {
IPath resourceLocation = resource.getLocation(); IPath resourceLocation = resource.getLocation();
if (resourceLocation == null) { if (resourceLocation == null) {
// could be an EFS path
URI locationURI = resource.getLocationURI();
if(locationURI == null)
return false; return false;
// Use the path information from the URI to see if the path as seen by the build
// matches the path that the resource points to.
// This relies on the assumption that the EFS filesystem being used stores path information in the path
// portion of the URI. This may not be in fact the case, but most filesystems adhere to such a format.
String path = locationURI.getPath();
if(path == null)
return false;
if(location.isAbsolute())
return location.toString().equals(path);
IPath uriPath = new Path(path);
int prefixLen = uriPath.segmentCount() - location.segmentCount();
return prefixLen >= 0 && uriPath.removeFirstSegments(prefixLen).equals(location);
} }
if (location.getDevice()==null) { if (location.getDevice()==null) {
resourceLocation = resourceLocation.setDevice(null); resourceLocation = resourceLocation.setDevice(null);