From 7255be1684f54fe00eb15a182278b59a4219da8a Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 24 Aug 2016 14:06:29 +0200 Subject: [PATCH] [500192] IdeContentProposalProvider - Don't call Scope Provider with null model Signed-off-by: Christian Dietrich --- .../editor/contentassist/IdeContentProposalProvider.xtend | 5 +++-- .../editor/contentassist/IdeContentProposalProvider.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend index dab362ae5..e38920e34 100644 --- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend +++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend @@ -127,8 +127,9 @@ class IdeContentProposalProvider { val type = findCurrentTypeAfter(reference) if (type instanceof EClass) { val ereference = GrammarUtil.getReference(reference, type) - if (ereference !== null) { - val scope = scopeProvider.getScope(context.currentModel, ereference) + val currentModel = context.currentModel + if (ereference !== null && currentModel !== null) { + val scope = scopeProvider.getScope(currentModel, ereference) crossrefProposalProvider.lookupCrossReference(scope, reference, context, acceptor, getCrossrefFilter(reference, context)) } diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.java index 292b0caf2..b69b86ace 100644 --- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.java +++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.java @@ -179,9 +179,9 @@ public class IdeContentProposalProvider { final EClassifier type = this._currentTypeFinder.findCurrentTypeAfter(reference); if ((type instanceof EClass)) { final EReference ereference = GrammarUtil.getReference(reference, ((EClass)type)); - if ((ereference != null)) { - EObject _currentModel = context.getCurrentModel(); - final IScope scope = this.scopeProvider.getScope(_currentModel, ereference); + final EObject currentModel = context.getCurrentModel(); + if (((ereference != null) && (currentModel != null))) { + final IScope scope = this.scopeProvider.getScope(currentModel, ereference); Predicate _crossrefFilter = this.getCrossrefFilter(reference, context); this.crossrefProposalProvider.lookupCrossReference(scope, reference, context, acceptor, _crossrefFilter); }