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

[xtext.xtext] use IResourceDescription.Manager for scoping

Browse source 
...instead of GlobalResourceDescriptionProvider. 

Because when the grammar is loaded from an .xtextbin file, 
the GlobalResourceDescriptionProvider returns null, because there
is no IResourceServiceProvider registered for *.xtextbin.

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
This commit is contained in:
Moritz Eysholdt 2015-08-06 14:13:52 +02:00
parent 1b6a71b2e6
commit 97e20348b3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java
View file

@ -39,7 +39,6 @@ import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.scoping.IGlobalScopeProvider;
import org.eclipse.xtext.scoping.IScope;
import org.eclipse.xtext.scoping.impl.AbstractScopeProvider;
import org.eclipse.xtext.scoping.impl.GlobalResourceDescriptionProvider;
import org.eclipse.xtext.scoping.impl.SelectableBasedScope;
import org.eclipse.xtext.scoping.impl.SimpleScope;
@ -54,7 +53,7 @@ import com.google.inject.Inject;
public class XtextScopeProvider extends AbstractScopeProvider {
@Inject
private GlobalResourceDescriptionProvider resourceDecriptionProvider;
private IResourceDescription.Manager resourceDescriptionManager;
@Inject
private IGlobalScopeProvider globalScopeProvider;
@ -156,7 +155,7 @@ public class XtextScopeProvider extends AbstractScopeProvider {
}
protected IScope createScope(final Grammar grammar, final EClass type, IScope parent) {
final IResourceDescription resourceDescription = resourceDecriptionProvider.getResourceDescription(grammar.eResource());
final IResourceDescription resourceDescription = resourceDescriptionManager.getResourceDescription(grammar.eResource());
return SelectableBasedScope.createScope(parent, resourceDescription, type, false);
}