From f3bb495761c77c0c5ecf99cbb2b2f5532f9ed8be Mon Sep 17 00:00:00 2001
From: Timotei Dolean <timotei21@gmail.com>
Date: Fri, 6 Aug 2010 21:43:07 +0000
Subject: [PATCH] eclipse plugin: add macro parameters

---
 .../utils/PreprocessorUtils.java                    |  9 +++++++--
 .../ui/contentassist/WMLProposalProvider.java       | 13 ++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/PreprocessorUtils.java b/utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/PreprocessorUtils.java
index a94cc42dfff..1c7a0907228 100644
--- a/utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/PreprocessorUtils.java
+++ b/utils/java/eclipse_plugin/src/wesnoth_eclipse_plugin/utils/PreprocessorUtils.java
@@ -104,14 +104,19 @@ public class PreprocessorUtils
 				arguments.add(macrosFile);
 			}
 
+			//TODO: remove me when trimming is done
+			if (defines == null)
+				defines = new ArrayList<String>();
+			defines.add("NO_TERRAIN_GFX");
+
 			if (defines != null && !defines.isEmpty())
 			{
 				String argument = "-p=";
-				for(int i=0;i<defines.size()-1;i++)
+				for(int i=0;i< defines.size() - 1;i++)
 				{
 					argument += (defines.get(i) + ",");
 				}
-				argument  += defines.get(defines.size()-1);
+				argument += defines.get(defines.size()-1);
 				arguments.add(argument);
 			}
 			else
diff --git a/utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java b/utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
index 7f84a3c4fab..123bf4cfa80 100644
--- a/utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
+++ b/utils/java/org.wesnoth.wml.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
@@ -111,9 +111,16 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
 
 		for(Define define : ProjectUtils.getCacheForProject(file.getProject()).getDefines())
 		{
-			acceptor.accept(createCompletionProposal(
-					(ruleProposal == true ? "{" : "") + define.getName() + "}",
-					define.getName(),
+			StringBuilder proposal = new StringBuilder(10);
+			if (ruleProposal == true)
+				proposal.append("{");
+			proposal.append(define.getName());
+
+			for(String arg : define.getArguments())
+				proposal.append(" " + arg);
+			proposal.append("}");
+
+			acceptor.accept(createCompletionProposal(proposal.toString(), define.getName(),
 					WMLLabelProvider.getImageByName("macrocall.png"), context));
 		}
 	}