completion/ui: IElementLabelProviderExtension which accepts CompletionProposal

Author: panchenko

plugins/org.eclipse.dltk.javascript.ui/src/org/eclipse/dltk/javascript/internal/ui/text/completion/JavaScriptCompletionProposalLabelProvider.java

@@ -43,7 +43,7 @@ public class JavaScriptCompletionProposalLabelProvider extends
 	public String createTypeProposalLabel(CompletionProposal typeProposal) {
 		if (typeProposal.getExtraInfo() instanceof Type) {
 			final Type type = (Type) typeProposal.getExtraInfo();
-			final String label = getElementLabel(type);
+			final String label = getElementLabel(type, typeProposal);
 			if (label != null) {
 				return label;
 			}
@@ -66,8 +66,10 @@ public String createTypeProposalLabel(CompletionProposal typeProposal) {
 		return super.createTypeProposalLabel(typeProposal);
 	}
 
-	private static String getElementLabel(Element element) {
-		return ElementLabelProviderRegistry.getLabel(element, Mode.PROPOSAL);
+	private static String getElementLabel(Element element,
+			CompletionProposal proposal) {
+		return ElementLabelProviderRegistry.getLabel(element, Mode.PROPOSAL,
+				proposal);
 	}
 
 	@Override
@@ -77,7 +79,7 @@ protected String createMethodProposalLabel(CompletionProposal methodProposal) {
 		final Object info = methodProposal.getExtraInfo();
 		if (info instanceof Method) {
 			final Method method = (Method) info;
-			final String label = getElementLabel(method);
+			final String label = getElementLabel(method, methodProposal);
 			if (label != null) {
 				return label;
 			}
@@ -127,7 +129,7 @@ protected String createFieldProposalLabel(CompletionProposal proposal) {
 		final Object info = proposal.getExtraInfo();
 		if (info instanceof Property) {
 			final Property property = (Property) proposal.getExtraInfo();
-			final String label = getElementLabel(property);
+			final String label = getElementLabel(property, proposal);
 			if (label != null) {
 				return label;
 			}

plugins/org.eclipse.dltk.javascript.ui/src/org/eclipse/dltk/javascript/ui/typeinfo/ElementLabelProviderRegistry.java

@@ -33,8 +33,18 @@ public static ImageDescriptor getImageDescriptor(Element element) {
 	}
 
 	public static String getLabel(Element element, Mode mode) {
+		return getLabel(element, mode, null);
+	}
+
+	public static String getLabel(Element element, Mode mode, Object context) {
 		for (IElementLabelProvider provider : manager) {
-			String label = provider.getLabel(element, mode);
+			final String label;
+			if (provider instanceof IElementLabelProviderExtension) {
+				label = ((IElementLabelProviderExtension) provider).getLabel(
+						element, mode, context);
+			} else {
+				label = provider.getLabel(element, mode);
+			}
 			if (label != null) {
 				return label;
 			}

plugins/org.eclipse.dltk.javascript.ui/src/org/eclipse/dltk/javascript/ui/typeinfo/IElementLabelProviderExtension.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2012 NumberFour AG
+ *
+ * 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:
+ *     NumberFour AG - initial API and Implementation (Alex Panchenko)
+ *******************************************************************************/
+package org.eclipse.dltk.javascript.ui.typeinfo;
+
+import org.eclipse.dltk.core.CompletionProposal;
+import org.eclipse.dltk.javascript.typeinfo.model.Element;
+
+public interface IElementLabelProviderExtension extends IElementLabelProvider {
+
+	/**
+	 * Similar to {@link #getLabel(Element, Mode)}, but has additional parameter
+	 * <code>context</code>, if <code>mode</code> is {@link Mode#PROPOSAL} then
+	 * context should be of the {@link CompletionProposal} type.
+	 * 
+	 * @return label or <code>null</code> to use next provider or default
+	 *         implementation if none of the providers returned it.
+	 */
+	String getLabel(Element element, Mode mode, Object context);
+
+}