From 1cd02db387986e641eac95123254f7b735713b5e Mon Sep 17 00:00:00 2001 From: Fabien Coulon Date: Tue, 16 Feb 2016 18:36:46 +0100 Subject: [PATCH] [Content assist] Improve ae18b9c2cd92ef2d2f6a216610b87f5e435901e1 --- .../inria/diverse/melange/ui/contentassist/IProposal.java | 3 ++- .../melange/ui/contentassist/MelangeProposalProvider.xtend | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/IProposal.java b/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/IProposal.java index b07d711e9..14bd32952 100644 --- a/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/IProposal.java +++ b/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/IProposal.java @@ -1,6 +1,7 @@ package fr.inria.diverse.melange.ui.contentassist; import org.eclipse.core.resources.IProject; +import org.eclipse.emf.ecore.EObject; public interface IProposal { @@ -20,5 +21,5 @@ public interface IProposal { */ public void configureProject(IProject project); - public void configureProposal(String packageName, String languageName); + public void configureProposal(EObject context); } diff --git a/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/MelangeProposalProvider.xtend b/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/MelangeProposalProvider.xtend index 939d59a05..c1d627af4 100644 --- a/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/MelangeProposalProvider.xtend +++ b/plugins/fr.inria.diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/MelangeProposalProvider.xtend @@ -52,12 +52,7 @@ class MelangeProposalProvider extends AbstractMelangeProposalProvider val realProp = e.createExecutableExtension("class"); if (realProp instanceof IProposal) { if(model instanceof Language){ - val lang = model as Language - val root = lang.eContainer as ModelTypingSpace - realProp.configureProposal(root.name,lang.name) - } - else{ - realProp.configureProposal("packageName","languageName") + realProp.configureProposal(model) } val proposal = createCompletionProposal("", realProp.displayText, null, context) if(proposal !== null){