sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #224 from eclipse/se/bug466667

Browse source 
[xtend] don’t index xtend sources from jars (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=466667)
This commit is contained in:
Sven Efftinge 2015-05-21 14:28:02 +02:00
commit 9bea9f7542
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/ui/util/JavaProjectSetupUtil.java
View file

@ -374,6 +374,13 @@ public class JavaProjectSetupUtil {
addToClasspath(javaProject, newLibraryEntry);
return newLibraryEntry;
}
public static IClasspathEntry addExternalJarToClasspath(IJavaProject javaProject, File file) throws JavaModelException {
IClasspathEntry newLibraryEntry = JavaCore.newLibraryEntry(new Path(file.getAbsolutePath()), null, null);
addToClasspath(javaProject, newLibraryEntry);
return newLibraryEntry;
}
public static File createExternalJar(InputStream data, String nameWithoutJarSuffix) throws IOException,
FileNotFoundException {

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/ResourceStorageFacade.xtend
View file

@ -94,6 +94,10 @@ class ResourceStorageFacade implements IResourceStorageFacade {
if (resource.resourceSet.URIConverter.exists(resource.URI.getBinaryStorageURI, emptyMap)) {
return true
}
// if it's an archive URI, we don't need to look up the source folder-output folder scheme
if (resource.URI.isArchive) {
return false
}
// check for source project locations, i.e. use generator config
val fsa = getFileSystemAccess(resource);