eclipse: treat jars in var libraries in the same manner (IDEA-53855)

This commit is contained in:
anna
2010-04-13 18:17:50 +04:00
parent 692e08307b
commit fa85663813
@@ -344,7 +344,17 @@ public class EclipseClasspathReader {
private static String eclipseVariabledPath2Url(ModifiableRootModel rootModel, Set<String> usedVariables, String path, int varStart) {
final EPathVariable var = createEPathVariable(usedVariables, path, varStart);
return PathMacroManager.getInstance(rootModel.getModule()).expandPath(var.toIdeaVariabledUrl());
final String url = PathMacroManager.getInstance(rootModel.getModule()).expandPath(var.toIdeaVariabledUrl());
final VirtualFile localFile = VirtualFileManager.getInstance().findFileByUrl(url);
if (localFile != null) {
final VirtualFile jarFile = JarFileSystem.getInstance().getJarRootForLocalFile(localFile);
if (jarFile != null) {
return jarFile.getUrl();
}
}
return url;
}
private static EPathVariable createEPathVariable(final Set<String> usedVariables, final String pathAttr, final int varStart) {