[Content assist] Improve ae18b9c

diverse-project · Feb 16, 2016 · 1cd02db · 1cd02db
1 parent ae18b9c
commit 1cd02db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...diverse.melange.ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/IProposal.java b/...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/....ui/src/main/java/fr/inria/diverse/melange/ui/contentassist/MelangeProposalProvider.xtend b/....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){