Renamed myParamList to starParamList and fixed tests

This commit is contained in:
Aleksi Majander
2013-02-08 10:03:36 +02:00
committed by Pavel V. Talanov
parent f68fe0bc38
commit c701da8506
7 changed files with 14 additions and 14 deletions
@@ -43,11 +43,11 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi
val identifier : Identifier = constructClassTypeIdentifier(classType) val identifier : Identifier = constructClassTypeIdentifier(classType)
val resolvedClassTypeParams : List<Type> = createRawTypesForResolvedReference(classType) val resolvedClassTypeParams : List<Type> = createRawTypesForResolvedReference(classType)
if (classType.getParameterCount() == 0 && resolvedClassTypeParams.size() > 0) { if (classType.getParameterCount() == 0 && resolvedClassTypeParams.size() > 0) {
val myParamList : ArrayList<Type> = ArrayList<Type>() val starParamList : ArrayList<Type> = ArrayList<Type>()
if (resolvedClassTypeParams.size() == 1) { if (resolvedClassTypeParams.size() == 1) {
if ((resolvedClassTypeParams.get(0) as ClassType).`type`.name == "Any") { if ((resolvedClassTypeParams.get(0) as ClassType).`type`.name == "Any") {
myParamList.add(StarProjectionType()) starParamList.add(StarProjectionType())
myResult = ClassType(identifier, myParamList, true) myResult = ClassType(identifier, starParamList, true)
} }
else { else {
myResult = ClassType(identifier, resolvedClassTypeParams, true) myResult = ClassType(identifier, resolvedClassTypeParams, true)
@@ -30,8 +30,8 @@ public open class User() {
class object { class object {
public open fun main() : Unit { public open fun main() : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true) var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false) var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name") var i3 : Identifier<*>? = Identifier.init<String?>("name")
} }
} }
} }
+2 -2
View File
@@ -30,8 +30,8 @@ public open class User() {
class object { class object {
public open fun main(args : Array<String?>?) : Unit { public open fun main(args : Array<String?>?) : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true) var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false) var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name") var i3 : Identifier<*>? = Identifier.init<String?>("name")
} }
} }
} }
@@ -1,6 +1,6 @@
package test package test
open class User() { open class User() {
open fun main() : Unit { open fun main() : Unit {
var list : List<Any?>? = java.util.LinkedList() var list : List<*>? = java.util.LinkedList()
} }
} }
@@ -1,6 +1,6 @@
package test package test
open class User() { open class User() {
open fun main() : Unit { open fun main() : Unit {
var list : java.util.List<Any?>? = java.util.LinkedList() var list : java.util.List<*>? = java.util.LinkedList()
} }
} }
@@ -6,8 +6,8 @@ System.out?.println(e)
} }
open class Test() { open class Test() {
open fun main() : Unit { open fun main() : Unit {
var raw1 : Collection<Any?>? = Collection(1) var raw1 : Collection<*>? = Collection(1)
var raw2 : Collection<Any?>? = Collection<Int?>(1) var raw2 : Collection<*>? = Collection<Int?>(1)
var raw3 : Collection<Any?>? = Collection<String?>("1") var raw3 : Collection<*>? = Collection<String?>("1")
} }
} }
@@ -3,7 +3,7 @@ import java.util.LinkedList
open class Test() { open class Test() {
open fun main() : Unit { open fun main() : Unit {
var common : List<String?>? = LinkedList<String?>() var common : List<String?>? = LinkedList<String?>()
var raw : List<Any?>? = LinkedList<String?>() var raw : List<*>? = LinkedList<String?>()
var superRaw : List<Any?>? = LinkedList() var superRaw : List<*>? = LinkedList()
} }
} }