use MetaType when creating IRType from IRTypeDeclaration

Author: panchenko

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

@@ -32,4 +32,8 @@ public IRType toRType(ITypeSystem typeSystem, Type type) {
 		return new RSimpleType(typeSystem, type);
 	}
 
+	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
+		return new RSimpleType(typeSystem, declaration);
+	}
+
 }

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

@@ -33,4 +33,15 @@ public interface MetaType {
 	 */
 	IRType toRType(ITypeSystem typeSystem, Type type);
 
+	/**
+	 * Creates the corresponding {@link IRType} for the specified
+	 * {@link IRTypeDeclaration} instance.
+	 * 
+	 * @param typeSystem
+	 *            the context for the operation, possible <code>null</code>
+	 * @param type
+	 *            the type to wrap
+	 */
+	IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration);
+
 }

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

@@ -161,12 +161,13 @@ public static IRType simple(ITypeSystem typeSystem, Type type) {
 	}
 
 	public static IRType simple(IRTypeDeclaration declaration) {
-		return new RSimpleType(declaration);
+		return declaration.getSource().getMetaType().toRType(null, declaration);
 	}
 
 	public static IRType simple(ITypeSystem typeSystem,
 			IRTypeDeclaration declaration) {
-		return new RSimpleType(typeSystem, declaration);
+		return declaration.getSource().getMetaType()
+				.toRType(typeSystem, declaration);
 	}
 
 	public static IRType simple(Type type) {

tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinfo/MetaTypes.java

@@ -13,6 +13,7 @@
 
 import org.eclipse.dltk.javascript.typeinfo.DefaultMetaType;
 import org.eclipse.dltk.javascript.typeinfo.IRType;
+import org.eclipse.dltk.javascript.typeinfo.IRTypeDeclaration;
 import org.eclipse.dltk.javascript.typeinfo.ITypeSystem;
 import org.eclipse.dltk.javascript.typeinfo.MetaType;
 import org.eclipse.dltk.javascript.typeinfo.model.Type;
@@ -31,4 +32,9 @@ public IRType toRType(ITypeSystem typeSystem, Type type) {
 		return DefaultMetaType.DEFAULT.toRType(typeSystem, type);
 	}
 
+	@Override
+	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
+		return DefaultMetaType.DEFAULT.toRType(typeSystem, declaration);
+	}
+
 }

tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinfo/TestMetaType.java

@@ -13,6 +13,7 @@
 
 import org.eclipse.dltk.javascript.typeinfo.DefaultMetaType;
 import org.eclipse.dltk.javascript.typeinfo.IRType;
+import org.eclipse.dltk.javascript.typeinfo.IRTypeDeclaration;
 import org.eclipse.dltk.javascript.typeinfo.ITypeSystem;
 import org.eclipse.dltk.javascript.typeinfo.MetaType;
 import org.eclipse.dltk.javascript.typeinfo.model.Type;
@@ -31,4 +32,9 @@ public IRType toRType(ITypeSystem typeSystem, Type type) {
 		return DefaultMetaType.DEFAULT.toRType(typeSystem, type);
 	}
 
+	@Override
+	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
+		return DefaultMetaType.DEFAULT.toRType(typeSystem, declaration);
+	}
+
 }