ti: improve ITypeInferenceExtensionFactory API

Author: panchenko

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ITypeInferenceContext.java

@@ -13,14 +13,15 @@
 
 import java.util.Set;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.dltk.javascript.typeinference.IValueCollection;
 import org.eclipse.dltk.javascript.typeinfo.IModelBuilder;
 import org.eclipse.dltk.javascript.typeinfo.IRMember;
 import org.eclipse.dltk.javascript.typeinfo.ITypeInfoContext;
 import org.eclipse.dltk.javascript.typeinfo.ITypeProvider;
 import org.eclipse.dltk.javascript.typeinfo.TypeMode;
 
-public interface ITypeInferenceContext extends ITypeInfoContext {
+public interface ITypeInferenceContext extends ITypeInfoContext, IAdaptable {
 
 	@Deprecated
 	IValueTypeFactory getFactory();

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencer2.java

@@ -37,6 +37,7 @@
 import org.eclipse.dltk.javascript.typeinfo.IMemberEvaluator;
 import org.eclipse.dltk.javascript.typeinfo.IModelBuilder;
 import org.eclipse.dltk.javascript.typeinfo.IRMember;
+import org.eclipse.dltk.javascript.typeinfo.ITypeInfoContext;
 import org.eclipse.dltk.javascript.typeinfo.ITypeProvider;
 import org.eclipse.dltk.javascript.typeinfo.ITypeSystem;
 import org.eclipse.dltk.javascript.typeinfo.ReferenceSource;
@@ -516,4 +517,14 @@ public String toString() {
 				+ (v != null ? v.getClass().getSimpleName() : null) + ")";
 	}
 
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		if (adapter == ITypeInfoContext.class || adapter == ITypeSystem.class) {
+			return this;
+		} else if (adapter == ReferenceSource.class) {
+			return getSource();
+		} else {
+			return null;
+		}
+	}
+
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitorBase.java

@@ -25,7 +25,6 @@
 import org.eclipse.dltk.javascript.typeinference.IValueCollection;
 import org.eclipse.dltk.javascript.typeinference.IValueReference;
 import org.eclipse.dltk.javascript.typeinfo.ITypeChecker;
-import org.eclipse.dltk.javascript.typeinfo.ITypeInferenceExtensionFactory;
 import org.eclipse.dltk.javascript.typeinfo.ITypeInferenceHandler;
 import org.eclipse.dltk.javascript.typeinfo.ITypeInferenceHandlerFactory;
 import org.eclipse.dltk.javascript.typeinfo.ITypeInferencerVisitor;
@@ -107,22 +106,6 @@ protected List<ITypeInferenceHandler> createHandlers() {
 		return handlers;
 	}
 
-	@SuppressWarnings("unchecked")
-	protected <E> List<E> createExtensions(Class<E> extensionClass) {
-		final List<E> extensions = new ArrayList<E>();
-		for (ITypeInferenceHandlerFactory factory : TypeInfoManager
-				.getNodeHandlerFactories()) {
-			if (factory instanceof ITypeInferenceExtensionFactory) {
-				final Object extension = ((ITypeInferenceExtensionFactory) factory)
-						.createExtension(context, this, extensionClass);
-				if (extension != null && extensionClass.isInstance(extension)) {
-					extensions.add((E) extension);
-				}
-			}
-		}
-		return extensions;
-	}
-
 	@Override
 	public IValueReference visit(ASTNode node) {
 		if (handlers != null) {

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/validation/TypeInfoValidator.java

@@ -101,6 +101,7 @@
 import org.eclipse.dltk.javascript.typeinfo.MemberPredicates;
 import org.eclipse.dltk.javascript.typeinfo.RTypes;
 import org.eclipse.dltk.javascript.typeinfo.TypeCompatibility;
+import org.eclipse.dltk.javascript.typeinfo.TypeInfoManager;
 import org.eclipse.dltk.javascript.typeinfo.TypeUtil;
 import org.eclipse.dltk.javascript.typeinfo.model.Member;
 import org.eclipse.dltk.javascript.typeinfo.model.ParameterKind;
@@ -534,7 +535,8 @@ public void initialize() {
 			variables.clear();
 			functionScopes.clear();
 			functionScopes.add(new FunctionScope());
-			final List<IValidatorExtension> extensions = createExtensions(IValidatorExtension.class);
+			final List<IValidatorExtension> extensions = TypeInfoManager
+					.createExtensions(context, IValidatorExtension.class, null);
 			if (!extensions.isEmpty()) {
 				this.extensions = extensions
 						.toArray(new IValidatorExtension[extensions.size()]);

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/CompletionVisitor.java

@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.dltk.javascript.internal.core.codeassist;
 
-import java.util.List;
 import java.util.Stack;
 
 import org.eclipse.dltk.ast.ASTNode;
@@ -21,7 +20,6 @@
 import org.eclipse.dltk.javascript.ast.FunctionStatement;
 import org.eclipse.dltk.javascript.typeinference.IValueCollection;
 import org.eclipse.dltk.javascript.typeinference.IValueReference;
-import org.eclipse.dltk.javascript.validation.IValidatorExtension;
 
 public class CompletionVisitor extends TypeInferencerVisitor {
 
@@ -94,8 +92,4 @@ public IValueCollection getCollection() {
 		return super.getCollection();
 	}
 
-	public List<IValidatorExtension> createValidatorExtensions() {
-		return createExtensions(IValidatorExtension.class);
-	}
-
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/JavaScriptCompletionEngine2.java

@@ -66,6 +66,7 @@
 import org.eclipse.dltk.javascript.typeinfo.MemberPredicate;
 import org.eclipse.dltk.javascript.typeinfo.MemberPredicates;
 import org.eclipse.dltk.javascript.typeinfo.RTypeMemberQuery;
+import org.eclipse.dltk.javascript.typeinfo.TypeInfoManager;
 import org.eclipse.dltk.javascript.typeinfo.TypeMode;
 import org.eclipse.dltk.javascript.typeinfo.model.Member;
 import org.eclipse.dltk.javascript.typeinfo.model.ParameterKind;
@@ -129,8 +130,9 @@ public void run() {
 							position);
 				}
 				final Reporter reporter = new Reporter(inferencer2, path
-						.lastSegment(), position, visitor
-						.createValidatorExtensions());
+						.lastSegment(), position, TypeInfoManager
+						.createExtensions(inferencer2,
+								IValidatorExtension.class, null));
 				if (calculator.isMember() && !path.isEmpty()
 						&& path.lastSegment() != null) {
 					doCompletionOnMember(inferencer2, visitor.getCollection(),
@@ -173,7 +175,8 @@ public void completeGlobals(ISourceModule module, final String prefix,
 		ITypeSystem.CURRENT.runWith(inferencer2, new Runnable() {
 			public void run() {
 				final Reporter reporter = new Reporter(inferencer2, prefix,
-						offset, visitor.createValidatorExtensions());
+						offset, TypeInfoManager.createExtensions(inferencer2,
+								IValidatorExtension.class, null));
 				doGlobalCompletion(visitor.getCollection(), reporter);
 			}
 		});
@@ -192,10 +195,9 @@ public void completeMembers(ISourceModule module, String prefix,
 		setSourceRange(offset - prefix.length(), offset);
 		final TypeInferencer2 inferencer2 = new TypeInferencer2();
 		inferencer2.setModelElement(module);
-		final CompletionVisitor visitor = new CompletionVisitor(inferencer2,
-				offset);
 		final Reporter reporter = new Reporter(inferencer2, prefix, offset,
-				visitor.createValidatorExtensions());
+				TypeInfoManager.createExtensions(inferencer2,
+						IValidatorExtension.class, null));
 		for (IRMember member : memers) {
 			final String name = member.getName();
 			if (reporter.matches(name)) {

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/ITypeInferenceExtensionFactory.java

@@ -11,21 +11,29 @@
  *******************************************************************************/
 package org.eclipse.dltk.javascript.typeinfo;
 
+import org.eclipse.core.runtime.IAdaptable;
+
 /**
  * This interface could be optionally implemented by
  * {@link ITypeInferenceHandlerFactory}.
  */
 public interface ITypeInferenceExtensionFactory {
 
 	/**
+	 * Creates extension of the specified type for the specified context.
+	 * Returns the extension created or null.
+	 * 
 	 * @param context
-	 * @param visitor
+	 *            can be adapted to {@link ITypeInfoContext} or
+	 *            {@link ReferenceSource}
 	 * @param extensionClass
 	 *            e.g.
 	 *            {@link org.eclipse.dltk.javascript.validation.IValidatorExtension}
+	 * @param arg
+	 *            extension specific parameter, can be <code>null</code>
 	 * @return
 	 */
-	Object createExtension(ITypeInfoContext context,
-			ITypeInferencerVisitor visitor, Class<?> extensionClass);
+	Object createExtension(IAdaptable context, Class<?> extensionClass,
+			Object arg);
 
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/ReferenceSource.java

@@ -11,10 +11,11 @@
  *******************************************************************************/
 package org.eclipse.dltk.javascript.typeinfo;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.dltk.core.IModelElement;
 import org.eclipse.dltk.core.ISourceModule;
 
-public class ReferenceSource {
+public class ReferenceSource implements IAdaptable {
 
 	public static final ReferenceSource UNKNOWN = new ReferenceSource(null) {
 		@Override
@@ -43,4 +44,12 @@ public String toString() {
 		return modelElement != null ? modelElement.getElementName() : "null";
 	}
 
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		if (adapter == ReferenceSource.class) {
+			return this;
+		} else {
+			return null;
+		}
+	}
+
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/TypeInfoManager.java

@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.dltk.annotations.ConfigurationElement;
@@ -212,6 +213,36 @@ public static ITypeInferenceHandlerFactory[] getNodeHandlerFactories() {
 		return nodeHandlerManager.getInstances();
 	}
 
+	/**
+	 * Creates extensions of the specified type for the specified context.
+	 * 
+	 * @param context
+	 *            can be adapted to {@link ITypeInfoContext} or
+	 *            {@link ReferenceSource}
+	 * @param extensionClass
+	 *            extension type, see {@link ITypeInferenceExtensionFactory} for
+	 *            the list of supported extensions.
+	 * @param arg
+	 *            extension specific parameter, can be <code>null</code>
+	 * @see ITypeInferenceExtensionFactory
+	 */
+	@SuppressWarnings("unchecked")
+	public static <E> List<E> createExtensions(IAdaptable context,
+			Class<E> extensionClass, Object arg) {
+		final List<E> extensions = new ArrayList<E>();
+		for (ITypeInferenceHandlerFactory factory : TypeInfoManager
+				.getNodeHandlerFactories()) {
+			if (factory instanceof ITypeInferenceExtensionFactory) {
+				final Object extension = ((ITypeInferenceExtensionFactory) factory)
+						.createExtension(context, extensionClass, arg);
+				if (extension != null && extensionClass.isInstance(extension)) {
+					extensions.add((E) extension);
+				}
+			}
+		}
+		return extensions;
+	}
+
 	public static IRTypeFactory[] getRTypeFactories() {
 		return typeFactoryManager.getInstances();
 	}