From 97e20348b3627809ecdf98debf5a50777293b9d8 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 6 Aug 2015 14:13:52 +0200 Subject: [PATCH] [xtext.xtext] use IResourceDescription.Manager for scoping ...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 --- .../src/org/eclipse/xtext/xtext/XtextScopeProvider.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java index 2e76d0b85..ff4527c38 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextScopeProvider.java @@ -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); }