From 3b8b34cf45112b7465a89f5d7ef4f4f79e35dc63 Mon Sep 17 00:00:00 2001
From: fdodino <fernando.dodino@gmail.com>
Date: Thu, 14 Dec 2017 17:50:17 -0300
Subject: [PATCH] Added Wollok Proposal for Constructor Calls with Named
 Parameters

---
 org.uqbar.project.wollok.ui/icons/assignment.png  | Bin 0 -> 831 bytes
 .../src/org/uqbar/project/wollok/ui/Messages.java |   5 ++++-
 .../contentassist/WollokDslProposalProvider.xtend |  12 ++++++++++++
 .../WollokTemplateProposalProvider.xtend          |   8 ++++----
 .../uqbar/project/wollok/ui/messages.properties   |   3 +++
 .../project/wollok/ui/messages_es.properties      |   3 +++
 .../ui/quickfix/WollokDslQuickfixProvider.xtend   |   6 +++---
 .../wollok/model/WollokModelExtensions.xtend      |   4 ++++
 8 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 org.uqbar.project.wollok.ui/icons/assignment.png

diff --git a/org.uqbar.project.wollok.ui/icons/assignment.png b/org.uqbar.project.wollok.ui/icons/assignment.png
new file mode 100644
index 0000000000000000000000000000000000000000..3556391f17952e66d68f0c531e926c0e987db225
GIT binary patch
literal 831
zcmV-F1Hk-=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;S3HGE(9Z{J}dwL0?bK7
zK~y-)Rg+(cRCOH1Klk3>{X09}+1Z&{*By7(&2o`gvjstm7;9@yeNbTveUN&Y$j}H4
zA|GZT=&^^O2g%(*Q5Kw_!atx;i$;MuiVu#UCA9QlQjsjIn``drVRtX|a5&$G!{PAd
z9FQy|i@vxM$pS)2l*<GXwpzFnrconM3s-HtR*gu)t(M8bhF7|f93+RebuTd->P|^Q
z!rr)%aA1H~!j>?#DpC6so`ivO@{tUZ;hAa<$zf<`0m-5JP>NzDOiUpU_&@-p02ic?
zZ0Qri+;>P`f`$SlgP-||RQ~-WW%YElcw0!8P4A}NJbto;?3&|zOiU9Gu$UqMT*AUn
z%v*ct9NZ5$9N9hxSnMTY?WfBjziyoD;02@<@l#h>@zNn$is{{Skd9RskOI<u-xCi^
zAo*0MbBrmC<Rke8C=z6U<_ZDJo}OT4YAbK-_>0-UM_D#-hHLl)*;~v%irL&;$@Rl^
zPR_070AN|OP*{JF;)`QQX{0oLBXx4m{y_1y50O$xX$r$%kXijBQp5-9MT(FDzE#>_
zI}ZT?P<s6!5AScLbMORz+^kaCHpkT2qiEj832*cEuLZst9j76~znTTP23ddd&vc1f
zxXj!eBFvrTPV)q%QI7||ya{~C<C#@hnxWDEJB{00xra>;^MGXt;>%3`wu>z<zr{N@
z-s3qQ(Zpx!{5U5$M)&jYqPYk7U6+!iJv;%RiGj8{$glf|^vX%3fb&W%eHh6nT7HJi
znghH#v4Ycz7`YoWayL%Ohvc*WQa&lr?#UdI$BwTvNQTj)*+sGQKNLR;Da$}x9+e{t
zjxUU*6TybPT}g$P#s==fJ_HafaIFy_ISiL`lqU_6l`z=-{bUwLWJ}olDs)H~wQ$dU
zjt{3Q4ny53B#YsmXwluO*D*`$+gG8ZRwa@!YU4?`60RBq{{b;NU|wOos@DJj002ov
JPDHLkV1mB+chvv@

literal 0
HcmV?d00001

diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/Messages.java b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/Messages.java
index e46f87d9cc..826b5bcb8d 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/Messages.java
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/Messages.java
@@ -67,7 +67,10 @@ public class Messages extends NLS {
 	
 	public static String WollokTemplateProposalProvider_WConstructorCall_name;
 	public static String WollokTemplateProposalProvider_WConstructorCall_description;
-	
+
+	public static String WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_name;
+	public static String WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_description;
+
 	public static String WollokTemplateProposalProvider_WConstructor_name;
 	public static String WollokTemplateProposalProvider_WConstructor_description;
 	
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend
index fa98add2e0..e620345eca 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend
@@ -2,8 +2,12 @@ package org.uqbar.project.wollok.ui.contentassist
 
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.Assignment
+import org.eclipse.xtext.RuleCall
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
 import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor
+import org.uqbar.project.wollok.ui.Messages
+import org.uqbar.project.wollok.ui.WollokActivator
+import org.uqbar.project.wollok.wollokDsl.WConstructorCall
 import org.uqbar.project.wollok.wollokDsl.WExpression
 import org.uqbar.project.wollok.wollokDsl.WLibraryElement
 import org.uqbar.project.wollok.wollokDsl.WMember
@@ -26,6 +30,14 @@ class WollokDslProposalProvider extends AbstractWollokDslProposalProvider {
 	var extension BasicTypeResolver typeResolver = new BasicTypeResolver
 	WollokProposalBuilder builder
 
+	override complete_WConstructorCall(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		if (model instanceof WConstructorCall) {
+			val initializations = (model as WConstructorCall).createInitializersForNamedParametersInConstructor
+			acceptor.accept(createCompletionProposal(initializations, Messages.WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_name, WollokActivator.getInstance.getImageDescriptor('icons/assignment.png').createImage, context))
+		}
+		super.complete_WConstructorCall(model, ruleCall, context, acceptor)
+	}
+	
 	// This whole implementation is just an heuristic until we have a type system
 	override completeWMemberFeatureCall_Feature(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		val call = model as WMemberFeatureCall
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/editor/templates/WollokTemplateProposalProvider.xtend b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/editor/templates/WollokTemplateProposalProvider.xtend
index 262ac1bd68..0eeddfee96 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/editor/templates/WollokTemplateProposalProvider.xtend
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/editor/templates/WollokTemplateProposalProvider.xtend
@@ -40,7 +40,7 @@ class WollokTemplateProposalProvider extends DefaultTemplateProposalProvider {
 	static Properties properties
 	ContextTypeIdHelper helper
 	@Inject
-	extension WollokDslGrammarAccess ga;
+	extension WollokDslGrammarAccess ga
 	
 	@Inject
 	new(TemplateStore templateStore, ContextTypeRegistry registry, ContextTypeIdHelper helper) {
@@ -54,7 +54,7 @@ class WollokTemplateProposalProvider extends DefaultTemplateProposalProvider {
     
     val extension builder = new TemplateBuilder(grammar, "org.uqbar.project.wollok", "WollokTemplateProposalProvider", getProperties,  [rule, name, description, id, content | 
     	addTemplate(rule, templateContext, acceptor, name, description, id, context, content)
-    ]);
+    ])
     
     builder
     
@@ -141,12 +141,12 @@ try {
 	}
 		
 	def addTemplate(AbstractRule rule, TemplateContext templateContext, ITemplateAcceptor acceptor, String name, String description, String tid, ContentAssistContext context, String c) {
-		val id = helper.getId(rule);
+		val id = helper.getId(rule)
 		template(templateContext, id, name, description, tid, c, acceptor, context)
 	}
 	
 	def addTemplate(AbstractElement rule, TemplateContext templateContext, ITemplateAcceptor acceptor, String name, String description, String tid, ContentAssistContext context, String c) {
-		val id = helper.getId(rule);
+		val id = helper.getId(rule)
 		template(templateContext, id, name, description, tid, c, acceptor, context)
 	}
 	
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages.properties b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages.properties
index 8a4faf0dec..7dc1e057c4 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages.properties
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages.properties
@@ -137,6 +137,9 @@ WollokTemplateProposalProvider_WVariableDeclaration_description = Add new refere
 
 WollokTemplateProposalProvider_WConstructorCall_name = Constructor call
 WollokTemplateProposalProvider_WConstructorCall_description = Add a Constructor call
+
+WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_name = Initialize attributes
+WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_description = Add named parameters to constructor call
 	
 WollokTemplateProposalProvider_WConstructor_name = Add constructor
 WollokTemplateProposalProvider_WConstructor_description = Add a new Constructor
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages_es.properties b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages_es.properties
index 4e274da78f..dcd21969f7 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages_es.properties
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/messages_es.properties
@@ -224,6 +224,9 @@ WollokTemplateProposalProvider_WVariableDeclaration_description = Agregar una nu
 WollokTemplateProposalProvider_WConstructorCall_name = Llamada a constructor
 WollokTemplateProposalProvider_WConstructorCall_description = Agregar llamada a constructor
 
+WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_name = Inicializar atributos
+WollokTemplateProposalProvider_WConstructorCallWithNamedParameter_description = Agregar parámetros nombrados en el constructor
+
 WollokTemplateProposalProvider_WConstructor_name = Agregar constructor
 WollokTemplateProposalProvider_WConstructor_description = Agregar un nuevo constructor
 	
diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/quickfix/WollokDslQuickfixProvider.xtend b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/quickfix/WollokDslQuickfixProvider.xtend
index bf1de2f946..07beed83a6 100644
--- a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/quickfix/WollokDslQuickfixProvider.xtend
+++ b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/quickfix/WollokDslQuickfixProvider.xtend
@@ -215,9 +215,9 @@ class WollokDslQuickfixProvider extends DefaultQuickfixProvider {
 	def addMissingAttributesInConstructorCall(Issue issue, IssueResolutionAcceptor acceptor) {
 		acceptor.accept(issue, Messages.WollokDslQuickFixProvider_add_missing_initializations_name,
 			Messages.WollokDslQuickFixProvider_add_missing_initializations_description, null) [ e, it |
-			val initializations = (e as WConstructorCall)
-				.uninitializedNamedParameters.map 
-					[ ", " + variable.name + " = value" ].join
+			val call = e as WConstructorCall
+			val preffix = if (call.hasNamedParameters) ", " else ""  
+			val initializations = preffix + call.createInitializersForNamedParametersInConstructor
 			xtextDocument.replace(e.node.endOffset - 1, 0, initializations)
 		]
 	}
diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend
index 57df70aebe..a187f8101e 100644
--- a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend
+++ b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend
@@ -680,4 +680,8 @@ class WollokModelExtensions {
 		uninitializedAttributes.filter [ arg | !namedArguments.contains(arg.variable.name) ]
 	}
 	
+	def static createInitializersForNamedParametersInConstructor(WConstructorCall it) {
+		uninitializedNamedParameters.map 
+			[ variable.name + " = value" ].join(", ")
+	}
 }