Bug 411498: Content assist in Makefile Editor for builtin functions

build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
-Bundle-Version: 7.2.0.qualifier
+Bundle-Version: 7.3.0.qualifier
 Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/makefile/IAutomaticVariable.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2013,2013 Andrew Gvozdev and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andrew Gvozdev - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.make.core.makefile;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition;
+
+/**
+ * Interface fore built-in automatic variables.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 7.3
+ */
+public interface IAutomaticVariable extends IVariableDefinition {
+}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/makefile/IBuiltinFunction.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2013,2013 Andrew Gvozdev and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andrew Gvozdev - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.make.core.makefile;
+
+/**
+ * Interface fore built-in internal functions.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 7.3
+ */
+public interface IBuiltinFunction  extends IDirective {
+
+	/**
+	 * @return the name of the function
+	 */
+	String getName();
+
+	/**
+	 * @return the value of the function
+	 */
+	StringBuffer getValue();
+
+}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/makefile/IMakefile.java

@@ -84,11 +84,23 @@ public interface IMakefile extends IParent {
 	 */
 	IDirective[] getBuiltins();
 
+	/**
+	 * @return all the built-in FunctionDefintions
+	 * @since 7.3
+	 */
+	IBuiltinFunction[] getBuiltinFunctions();
+	
 	/**
 	 * @return all the built-in MacroDefintions
 	 */
 	IMacroDefinition[] getBuiltinMacroDefinitions();
 
+	/**
+	 * @return all the built-in MacroDefintions
+	 * @since 7.3
+	 */
+	IAutomaticVariable[] getAutomaticVariables();
+	
 	/**
 	 * @return the built-in macro definition for name.
 	 */

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java

@@ -14,6 +14,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.cdt.make.core.makefile.IBuiltinFunction;
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.core.makefile.IInferenceRule;
 import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
@@ -47,6 +48,11 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 	@Override
 	public abstract IDirective[] getBuiltins();
 
+	@Override
+	public IBuiltinFunction[] getBuiltinFunctions() {
+		return new IBuiltinFunction[0];
+	}
+
 	@Override
 	public IRule[] getRules() {
 		IDirective[] stmts = getDirectives(true);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java

@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.net.URI;
 
+import org.eclipse.cdt.make.core.makefile.IAutomaticVariable;
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
 
@@ -34,7 +35,8 @@ import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
  */
 
 public class NullMakefile extends AbstractMakefile {
-	public final static IDirective[] EMPTY_DIRECTIVES = new IDirective[0];
+	private final static IDirective[] EMPTY_DIRECTIVES = new IDirective[0];
+	private final static IAutomaticVariable[] EMPTY_AUTOMATIC_VARIABLES = new IAutomaticVariable[0];
 
 	public NullMakefile() {
 		super(null);
@@ -50,6 +52,11 @@ public class NullMakefile extends AbstractMakefile {
 		return EMPTY_DIRECTIVES;
 	}
 
+	@Override
+	public IAutomaticVariable[] getAutomaticVariables() {
+		return EMPTY_AUTOMATIC_VARIABLES;
+	}
+
 	public void addDirective(IDirective directive) {
 	}
 

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/AutomaticVariable.java

@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.core.makefile.gnu;
 
+import org.eclipse.cdt.make.core.makefile.IAutomaticVariable;
 import org.eclipse.cdt.make.internal.core.makefile.Directive;
 
 
@@ -20,7 +21,7 @@ import org.eclipse.cdt.make.internal.core.makefile.Directive;
  * @author Sebastian Bauer <mail@sebastianbauer.info>
  * @see "http://www.gnu.org/software/make/manual/make.html#Automatic-Variables"
  */
-public class AutomaticVariable extends VariableDefinition {
+public class AutomaticVariable extends VariableDefinition implements IAutomaticVariable {
 
 	public AutomaticVariable(Directive parent, String name, String description) {
 		super(parent, name, new StringBuffer(description));

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/BuiltinFunction.java

@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2013,2013 Andrew Gvozdev and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andrew Gvozdev - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.make.internal.core.makefile.gnu;
+
+import org.eclipse.cdt.make.core.makefile.IBuiltinFunction;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.internal.core.makefile.Directive;
+
+
+/**
+ * Represents GNUmakefile built-in internal functions.
+ */
+public class BuiltinFunction implements IBuiltinFunction {
+	private String name;
+	private Directive parent;
+	private StringBuffer sample;
+
+	public BuiltinFunction(Directive parent, String sample) {
+		this.name = getNameFromSample(sample);
+		this.parent = parent;
+		this.sample = new StringBuffer(sample);
+	}
+
+	private static String getNameFromSample(String sample) {
+		String name = sample;
+		if (sample.startsWith("$(") && sample.endsWith(")")) { //$NON-NLS-1$ //$NON-NLS-2$
+			name = sample.substring(2, sample.length() - 1);
+		}
+		return name;
+	}
+
+	@Override
+	public IDirective getParent() {
+		return parent;
+	}
+
+	@Override
+	public int getStartLine() {
+		return -1;
+	}
+
+	@Override
+	public int getEndLine() {
+		return -1;
+	}
+
+	@Override
+	public IMakefile getMakefile() {
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public StringBuffer getValue() {
+		return sample;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java

@@ -21,6 +21,8 @@ import java.util.Stack;
 import java.util.StringTokenizer;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IAutomaticVariable;
+import org.eclipse.cdt.make.core.makefile.IBuiltinFunction;
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
 import org.eclipse.cdt.make.core.makefile.gnu.IGNUMakefile;
@@ -74,8 +76,9 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 	public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	private String[] includeDirectories = new String[0];
+	private IDirective[] builtins = new IDirective[0];
 	@SuppressWarnings("nls")
-	private IDirective[] builtins = new IDirective[]{
+	private IAutomaticVariable[] autoVariables = new IAutomaticVariable[]{
 		new AutomaticVariable(this, "@", MakefileMessages.getString("GNUMakefile.automaticVariable.at")),
 		new AutomaticVariable(this, "%", MakefileMessages.getString("GNUMakefile.automaticVariable.percent")),
 		new AutomaticVariable(this, "<", MakefileMessages.getString("GNUMakefile.automaticVariable.less")),
@@ -85,6 +88,59 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		new AutomaticVariable(this, "|", MakefileMessages.getString("GNUMakefile.automaticVariable.pipe")),
 		new AutomaticVariable(this, "*", MakefileMessages.getString("GNUMakefile.automaticVariable.star")),
 	};
+
+	@SuppressWarnings("nls")
+	private final static String[] functions = {
+		"subst", "patsubst", "strip", "findstring",
+		"filter", "filter-out", "sort",
+		"word", "words", "wordlist", "firstword", "lastword",
+		"dir", "notdir",
+		"suffix", "basename", "addsuffix", "addprefix",
+		"join", "wildcard", "realpath", "abspath",
+		"if", "or", "and", "foreach",
+		"call", "value", "eval", "origin", "flavor",
+		"shell", "error", "warning", "info",
+	};
+
+	@SuppressWarnings("nls")
+	private IBuiltinFunction[] builtinFunctions = new IBuiltinFunction[]{
+		new BuiltinFunction(this, "$(subst from,to,text)"),
+		new BuiltinFunction(this, "$(patsubst pattern,replacement,text)"),
+		new BuiltinFunction(this, "$(strip string)"),
+		new BuiltinFunction(this, "$(findstring find,in)"),
+		new BuiltinFunction(this, "$(filter pattern,text)"),
+		new BuiltinFunction(this, "$(filter-out pattern,text)"),
+		new BuiltinFunction(this, "$(sort list)"),
+		new BuiltinFunction(this, "$(word n,text)"),
+		new BuiltinFunction(this, "$(words text)"),
+		new BuiltinFunction(this, "$(wordlist s,e,text)"),
+		new BuiltinFunction(this, "$(firstword names)"),
+		new BuiltinFunction(this, "$(lastword names)"),
+		new BuiltinFunction(this, "$(dir names)"),
+		new BuiltinFunction(this, "$(notdir names)"),
+		new BuiltinFunction(this, "$(suffix names)"),
+		new BuiltinFunction(this, "$(basename names)"),
+		new BuiltinFunction(this, "$(addsuffix suffix,names)"),
+		new BuiltinFunction(this, "$(addprefix prefix,names)"),
+		new BuiltinFunction(this, "$(join list1,list2)"),
+		new BuiltinFunction(this, "$(wildcard pattern)"),
+		new BuiltinFunction(this, "$(realpath names)"),
+		new BuiltinFunction(this, "$(abspath names)"),
+		new BuiltinFunction(this, "$(if condition,then-part,else-part)"),
+		new BuiltinFunction(this, "$(or condition1,condition2,...)"),
+		new BuiltinFunction(this, "$(and condition1,condition2,...)"),
+		new BuiltinFunction(this, "$(foreach var,list,text)"),
+		new BuiltinFunction(this, "$(call variable,param,...)"),
+		new BuiltinFunction(this, "$(value variable)"),
+		new BuiltinFunction(this, "$(eval expression)"),
+		new BuiltinFunction(this, "$(origin variable)"),
+		new BuiltinFunction(this, "$(flavor variable)"),
+		new BuiltinFunction(this, "$(shell command)"),
+		new BuiltinFunction(this, "$(error error: text)"),
+		new BuiltinFunction(this, "$(warning warning: text)"),
+		new BuiltinFunction(this, "$(info info: text)"),
+	};
+
 	private IMakefileReaderProvider makefileReaderProvider;
 
 	public GNUMakefile() {
@@ -798,6 +854,16 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		return builtins;
 	}
 
+	@Override
+	public IAutomaticVariable[] getAutomaticVariables() {
+		return autoVariables;
+	}
+	
+	@Override
+	public IBuiltinFunction[] getBuiltinFunctions() {
+		return builtinFunctions;
+	}
+	
 	@Override
 	public void setIncludeDirectories(String[] dirs) {
 		includeDirectories = dirs;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java

@@ -17,6 +17,7 @@ import java.io.Reader;
 import java.net.URI;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IAutomaticVariable;
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
 import org.eclipse.cdt.make.internal.core.makefile.AbstractMakefile;
@@ -64,6 +65,7 @@ import org.eclipse.core.runtime.CoreException;
 
 public class PosixMakefile extends AbstractMakefile {
 	private IDirective[] builtins = new IDirective[0];
+	private IAutomaticVariable[] automaticVariables = new IAutomaticVariable[0];
 	private IMakefileReaderProvider makefileReaderProvider;
 
 	public PosixMakefile() {
@@ -230,6 +232,11 @@ public class PosixMakefile extends AbstractMakefile {
 	public IDirective[] getBuiltins() {
 		return builtins;
 	}
+	@Override
+	public IAutomaticVariable[] getAutomaticVariables() {
+		return automaticVariables;
+	}
+
 
 	protected SpecialRule processSpecialRule(String line) {
 		line = line.trim();

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java

@@ -52,6 +52,7 @@ public class MakeUIImages {
 	public static final String IMG_OBJS_ENVIRONMENT = "icons/obj16/environment_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_ENV_VAR = "icons/obj16/envvar_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_AUTO_VARIABLE = "icons/obj16/var_auto.png"; //$NON-NLS-1$
+	public static final String IMG_OBJS_FUNCTION = "icons/obj16/builtin_func.png"; //$NON-NLS-1$
 
 	public static final String IMG_ETOOL_MAKEFILE = "icons/etool16/makefile.gif"; //$NON-NLS-1$
 	public static final String IMG_ETOOL_TARGET_BUILD = "icons/etool16/target_build.png"; //$NON-NLS-1$

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java

@@ -23,7 +23,10 @@ import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileReconcilingStrateg
 import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileTextHover;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.DefaultInformationControl;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
@@ -38,6 +41,7 @@ import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
 
 public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
@@ -95,6 +99,12 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
 			assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
 			assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
 			assistant.setContextInformationPopupBackground(fColorManager.getColor(new RGB(255, 255, 255)));
+			assistant.setInformationControlCreator(new IInformationControlCreator() {
+				@Override
+				public IInformationControl createInformationControl(Shell parent) {
+					return new DefaultInformationControl(parent, false);
+				}
+			});
 
 			return assistant;
 		}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/CompletionProposalComparator.java

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2013 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.make.internal.ui.text;
-
-import java.util.Comparator;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-public class CompletionProposalComparator implements Comparator<ICompletionProposal> {
-	/**
-	 * Constructor for CompletionProposalComparator.
-	 */
-	public CompletionProposalComparator() {
-	}
-
-	@Override
-	public int compare(ICompletionProposal c1, ICompletionProposal c2) {
-		return c1.getDisplayString().compareToIgnoreCase(c2.getDisplayString());
-	}
-
-}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java

@@ -25,8 +25,8 @@ public class WordPartDetector {
 
 	private enum WORDPART_TYPE {
 		MACRO,
-		INCLUDE,
 		FUNCTION_CALL,
+		INCLUDE,
 		UNDETERMINED,
 	}
 
@@ -61,6 +61,11 @@ public class WordPartDetector {
 				c = document.getChar(index);
 				if (c == '$') {
 					type = WORDPART_TYPE.MACRO;
+					int index2 = index + 1;
+					if (index2 < doc.getLength()) {
+						c = document.getChar(index2);
+						wordPart = doc.get(index2, endOffset - index2);
+					}
 					return;
 				} else if (Character.isWhitespace(c) || c == ')' || c == '}') {
 					break;
@@ -193,6 +198,6 @@ public class WordPartDetector {
 	}
 
 	private boolean isMakefileLetter(char c) {
-		return Character.isLetterOrDigit(c) || c == '_' || c == '.';
+		return Character.isLetterOrDigit(c) || "_-.@%<?^+|*".indexOf(c) >= 0;
 	}
 }

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 QNX Software Systems and others.
+ * Copyright (c) 2000, 2013 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,21 +7,23 @@
  *
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
+ *     Andrew Gvozdev
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.ui.text.makefile;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 
+import org.eclipse.cdt.make.core.makefile.IAutomaticVariable;
+import org.eclipse.cdt.make.core.makefile.IBuiltinFunction;
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
 import org.eclipse.cdt.make.core.makefile.IMakefile;
-import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
-import org.eclipse.cdt.make.internal.core.makefile.gnu.AutomaticVariable;
 import org.eclipse.cdt.make.internal.ui.MakeUIImages;
 import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
-import org.eclipse.cdt.make.internal.ui.text.CompletionProposalComparator;
 import org.eclipse.cdt.make.internal.ui.text.WordPartDetector;
 import org.eclipse.cdt.make.ui.IWorkingCopyManager;
 import org.eclipse.cdt.ui.CDTSharedImages;
@@ -61,42 +63,36 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 		}
 	}
 
-	public class DirectiveComparator implements Comparator<Object> {
-		@Override
-		public int compare(Object o1, Object o2) {
-			String name1;
-			String name2;
-
-			if (o1 instanceof IMacroDefinition) {
-				name1 = ((IMacroDefinition)o1).getName();
-			} else if (o1 instanceof IRule) {
-				name1 = ((IRule)o1).getTarget().toString();
-			} else {
-				name1 =""; //$NON-NLS-1$
-			}
-
-			if (o2 instanceof IMacroDefinition) {
-				name2 = ((IMacroDefinition)o1).getName();
-			} else if (o2 instanceof IRule) {
-				name2 = ((IRule)o1).getTarget().toString();
-			} else {
-				name2 =""; //$NON-NLS-1$
-			}
-
-			//return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
-			return name1.compareToIgnoreCase(name2);
-		}
-
-	}
 	protected IContextInformationValidator fValidator = new Validator();
-	protected Image imageMacro = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
+	protected Image imageFunction = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_FUNCTION);
+	protected Image imageVariable = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
 	protected Image imageAutomaticVariable = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_AUTO_VARIABLE);
 	protected Image imageTarget = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_TARGET);
 
-	protected CompletionProposalComparator comparator = new CompletionProposalComparator();
 	protected IEditorPart fEditor;
 	protected IWorkingCopyManager fManager;
 
+	private Comparator<IDirective> directivesComparator = new Comparator<IDirective>() {
+		@Override
+		public int compare(IDirective o1, IDirective o2) {
+			return o1.toString().compareToIgnoreCase(o2.toString());
+		}
+	};
+
+	private class BracketHandler {
+		private char open;
+		private char closed;
+		private boolean found;
+		private String followingText;
+		public BracketHandler(String input) {
+			char firstChar = input.length() > 0 ? input.charAt(0) : 0;
+			open = firstChar == '{' ? '{' : '(';
+			closed = firstChar == '{' ? '}' : ')';
+			found = firstChar == open;
+			followingText = found ?  input.substring(1) : input;
+		}
+	}
+
 	public MakefileCompletionProcessor(IEditorPart editor) {
 		fEditor = editor;
 		fManager =  MakeUIPlugin.getDefault().getWorkingCopyManager();
@@ -104,68 +100,161 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 
 	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
-		WordPartDetector wordPart = new WordPartDetector(viewer.getDocument(), documentOffset);
+		List<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>();
-		boolean macro = wordPart.isMacro();
 		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
-		IDirective[] statements = null;
+		WordPartDetector wordPart = new WordPartDetector(viewer.getDocument(), documentOffset);
-		if (macro) {
+		if (wordPart.isMacro()) {
-			IDirective[] m1 = makefile.getMacroDefinitions();
+			IAutomaticVariable[] automaticVariables = makefile.getAutomaticVariables();
-			IDirective[] m2 = makefile.getBuiltinMacroDefinitions();
+			proposalList.addAll(createCompletionProposals(wordPart, automaticVariables));
-			statements = new IDirective[m1.length + m2.length];
+
-			System.arraycopy(m1, 0, statements, 0, m1.length);
+			IMacroDefinition[] macroDefinitions = makefile.getMacroDefinitions();
-			System.arraycopy(m2, 0, statements, m1.length, m2.length);
+			Arrays.sort(macroDefinitions, directivesComparator);
+			proposalList.addAll(createCompletionProposals(wordPart, macroDefinitions));
+
+			IBuiltinFunction[] builtinFunctions = makefile.getBuiltinFunctions();
+			Arrays.sort(builtinFunctions, directivesComparator);
+			proposalList.addAll(createCompletionProposals(wordPart, builtinFunctions));
 		} else {
-			statements = makefile.getTargetRules();
+			ITargetRule[] targetRules = makefile.getTargetRules();
+			Arrays.sort(targetRules, directivesComparator);
+			proposalList.addAll(createCompletionProposals(wordPart, targetRules));
 		}
 
-		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(statements.length);
+		return proposalList.toArray(new ICompletionProposal[proposalList.size()]);
-
-		// iterate over all the different categories
-		for (IDirective statement : statements) {
-			String name = null;
-			Image image = null;
-			String infoString = "";//getContentInfoString(name); //$NON-NLS-1$
-			if (statement instanceof IMacroDefinition) {
-				name = ((IMacroDefinition) statement).getName();
-				image = imageMacro;
-				infoString = ((IMacroDefinition)statement).getValue().toString();
-			} else if (statement instanceof AutomaticVariable) {
-				name = ((IMacroDefinition) statement).getName();
-				image = imageAutomaticVariable;
-				infoString = ((IMacroDefinition)statement).getValue().toString();
-			} else if (statement instanceof IRule) {
-				name = ((IRule) statement).getTarget().toString();
-				image = imageTarget;
-				infoString = name;
 	}
-			if (name != null && name.startsWith(wordPart.getName())) {
+
-				IContextInformation info = new ContextInformation(name, infoString);
+	private String macro(String name, BracketHandler bracket) {
-				String displayString = (name.equals(infoString) ? name : name + " - " + infoString); //$NON-NLS-1$
+		if (bracket.found) {
-				ICompletionProposal result =
+			name = bracket.open + name + bracket.closed;
-						new CompletionProposal(
+		}
-								name,
+		return '$' + name;
+	}
+
+	private ArrayList<ICompletionProposal> createCompletionProposals(WordPartDetector wordPart, IAutomaticVariable[] autoVars) {
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(autoVars.length);
+		String wordPartName = wordPart.getName();
+		BracketHandler bracket = new BracketHandler(wordPartName);
+		String partialName = bracket.followingText;
+
+		for (IMacroDefinition autoVar : autoVars) {
+			String name = autoVar.getName();
+			if (name.startsWith(partialName)) {
+				String replacement;
+				if (bracket.found) {
+					replacement = name + bracket.closed;
+				} else {
+					replacement = name;
+				}
+				CompletionProposal proposal = new CompletionProposal(
+						replacement,
 						wordPart.getOffset(),
-								wordPart.getName().length(),
+						partialName.length(),
-								name.length(),
+						replacement.length(),
-								image,
+						imageAutomaticVariable,
+						macro(name, bracket) + " - " + autoVar.getValue().toString(), //$NON-NLS-1$
+						null,
+						autoVar.getValue().toString());
+				proposalList.add(proposal);
+			}
+		}
+		return proposalList;
+	}
+
+	private ArrayList<ICompletionProposal> createCompletionProposals(WordPartDetector wordPart, IMacroDefinition[] macros) {
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(macros.length);
+
+		String wordPartName = wordPart.getName();
+		BracketHandler bracket = new BracketHandler(wordPartName);
+		String partialName = bracket.followingText;
+
+		for (IMacroDefinition macro : macros) {
+			String name = macro.getName();
+			if (name.startsWith(partialName)) {
+				String replacement;
+				if (bracket.found) {
+					replacement = name + bracket.closed;
+				} else {
+					replacement = bracket.open + name + bracket.closed;
+				}
+				String displayString = name;
+				ICompletionProposal proposal = new CompletionProposal(
+						replacement,
+						wordPart.getOffset(),
+						partialName.length(),
+						replacement.length(),
+						imageVariable,
 						displayString,
-								info,
+						null,
-								infoString);
+						macro.getValue().toString());
-				proposalList.add(result);
+				proposalList.add(proposal);
 			}
 		}
-		ICompletionProposal[] proposals = proposalList.toArray(new ICompletionProposal[0]);
+		return proposalList;
-		Arrays.sort(proposals, comparator);
+	}
-		return proposals;
+
+	private ArrayList<ICompletionProposal> createCompletionProposals(WordPartDetector wordPart, IBuiltinFunction[] builtinFuns) {
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(builtinFuns.length);
+
+		String wordPartName = wordPart.getName();
+		BracketHandler bracket = new BracketHandler(wordPartName);
+		String partialName = bracket.followingText;
+
+		for (IBuiltinFunction builtinFun : builtinFuns) {
+			String name = builtinFun.getName();
+			String replacement;
+			if (bracket.found) {
+				replacement = name + bracket.closed;
+			} else {
+				replacement = bracket.open + name + bracket.closed;
+			}
+			int indexComma = replacement.indexOf(',');
+			int cursorPosition = indexComma >= 0 ? indexComma : replacement.length() - 1;
+			if (name.startsWith(partialName)) {
+				ICompletionProposal proposal = new CompletionProposal(
+						replacement,
+						wordPart.getOffset(),
+						partialName.length(),
+						cursorPosition,
+						imageFunction,
+						"$" + bracket.open + name + bracket.closed, //$NON-NLS-1$
+						null,
+						builtinFun.getValue().toString());
+				proposalList.add(proposal);
+			}
+		}
+		return proposalList;
+	}
+
+	private ArrayList<ICompletionProposal> createCompletionProposals(WordPartDetector wordPart, ITargetRule[] targets) {
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(targets.length);
+
+		String partialName = wordPart.getName();
+		for (ITargetRule target : targets) {
+			String name = target.getTarget().toString();
+			if (name.startsWith(partialName)) {
+				String replacement = name;
+				ICompletionProposal proposal = new CompletionProposal(
+						replacement,
+						wordPart.getOffset(),
+						partialName.length(),
+						replacement.length(),
+						imageTarget,
+						name,
+						null,
+						null);
+				proposalList.add(proposal);
+			}
+		}
+		return proposalList;
 	}
 
 	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
 		WordPartDetector wordPart = new WordPartDetector(viewer.getDocument(), documentOffset);
-		boolean macro = wordPart.isMacro();
 		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
 		ArrayList<String> contextList = new ArrayList<String>();
-		if (macro) {
+		ArrayList<IContextInformation> contextInformationList = new ArrayList<IContextInformation>();
+		if (wordPart.isMacro()) {
 			IDirective[] statements = makefile.getMacroDefinitions();
 			for (IDirective statement : statements) {
 				if (statement instanceof IMacroDefinition) {
@@ -174,6 +263,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 						String value = ((IMacroDefinition) statement).getValue().toString();
 						if (value != null && value.length() > 0) {
 							contextList.add(value);
+							contextInformationList.add(new ContextInformation(imageVariable, wordPart.getName(), value));
 						}
 					}
 				}
@@ -186,19 +276,15 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 						String value = ((IMacroDefinition) statement).getValue().toString();
 						if (value != null && value.length() > 0) {
 							contextList.add(value);
+							contextInformationList.add(new ContextInformation(imageAutomaticVariable, wordPart.getName(), value));
 						}
 					}
 				}
 			}
 		}
 
-		IContextInformation[] result = new IContextInformation[contextList.size()];
+		IContextInformation[] result = contextInformationList.toArray(new IContextInformation[contextInformationList.size()]);
-		for (int i = 0; i < result.length; i++) {
-			String context = contextList.get(i);
-			result[i] = new ContextInformation(imageMacro, wordPart.getName(), context);
-		}
 		return result;
-
 	}
 
 	@Override