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

[eclipse/xtext-core#1252] filter for contained resource descriptions

Browse source 
before any other filter operation

there is a performance benefit, when first exclude all irrelevant
resources before considering their IEObjectDescriptions

Signed-off-by: gabrield <d.gabriel@bachmann.info>
This commit is contained in:
gabrield 2019-10-03 13:04:35 +02:00 committed by gabrield
parent a3e52c5f37
commit 73f1f3e4e0
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
org.eclipse.xtext/src/org/eclipse/xtext/resource/containers/StateBasedContainer.java
View file

@ -12,6 +12,7 @@ import static java.util.Collections.*;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.function.Function;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
@ -21,6 +22,7 @@ import org.eclipse.xtext.resource.IEObjectDescription;
import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.resource.IResourceDescriptions;
import org.eclipse.xtext.resource.impl.ResourceDescriptionsBasedContainer;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@ -44,19 +46,24 @@ public class StateBasedContainer extends ResourceDescriptionsBasedContainer {
@Override
protected Iterable<IEObjectDescription> filterByURI(Iterable<IEObjectDescription> unfiltered) {
return Iterables.filter(unfiltered, new Predicate<IEObjectDescription>() {
Predicate<IEObjectDescription> predicate = getStateContainsPredicate(input -> input.getEObjectURI().trimFragment());
return Iterables.filter(unfiltered, predicate);
}
protected <T> Predicate<T> getStateContainsPredicate(Function<T, URI> uriProvider) {
return new Predicate<T>() {
private Collection<URI> contents = null;
@Override
public boolean apply(IEObjectDescription input) {
public boolean apply(T input) {
if(contents == null) {
contents = state.getContents();
}
URI resourceURI = input.getEObjectURI().trimFragment();
URI resourceURI = uriProvider.apply(input);
final boolean contains = contents.contains(resourceURI);
return contains;
}
});
};
}
@Override
@ -110,7 +117,10 @@ public class StateBasedContainer extends ResourceDescriptionsBasedContainer {
public Iterable<IEObjectDescription> getExportedObjectsByType(EClass type) {
if (isEmpty())
return emptyList();
return super.getExportedObjectsByType(type);
Predicate<IResourceDescription> isResourceDescritptionInState = getStateContainsPredicate(input -> input.getURI());
Iterable<IResourceDescription> resourceDescriptionsInState = Iterables.filter(getDescriptions().getAllResourceDescriptions(), isResourceDescritptionInState);
return IterableExtensions.flatMap(resourceDescriptionsInState, desc -> desc.getExportedObjectsByType(type));
}
@Override