azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed myParamList to starParamList and fixed tests

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
+3 -3
View File
@@ -43,11 +43,11 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi
val identifier : Identifier = constructClassTypeIdentifier(classType)
val resolvedClassTypeParams : List<Type> = createRawTypesForResolvedReference(classType)
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.get(0) as ClassType).`type`.name == "Any") {
myParamList.add(StarProjectionType())
myResult = ClassType(identifier, myParamList, true)
starParamList.add(StarProjectionType())
myResult = ClassType(identifier, starParamList, true)
}
else {
myResult = ClassType(identifier, resolvedClassTypeParams, true)
tests/testData/ast/constructors/file/genericIdentifier.kt
+2 -2
View File
@@ -30,8 +30,8 @@ public open class User() {
class object {
public open fun main() : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
var i3 : Identifier<*>? = Identifier.init<String?>("name")
}
}
}
tests/testData/ast/issues/file/kt-638.kt
+2 -2
View File
@@ -30,8 +30,8 @@ public open class User() {
class object {
public open fun main(args : Array<String?>?) : Unit {
var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
var i3 : Identifier<*>? = Identifier.init<String?>("name")
}
}
}
tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
open class User() {
open fun main() : Unit {
var list : List<Any?>? = java.util.LinkedList()
var list : List<*>? = java.util.LinkedList()
}
}
tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
open class User() {
open fun main() : Unit {
var list : java.util.List<Any?>? = java.util.LinkedList()
var list : java.util.List<*>? = java.util.LinkedList()
}
}
tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
+3 -3
View File
@@ -6,8 +6,8 @@ System.out?.println(e)
}
open class Test() {
open fun main() : Unit {
var raw1 : Collection<Any?>? = Collection(1)
var raw2 : Collection<Any?>? = Collection<Int?>(1)
var raw3 : Collection<Any?>? = Collection<String?>("1")
var raw1 : Collection<*>? = Collection(1)
var raw2 : Collection<*>? = Collection<Int?>(1)
var raw3 : Collection<*>? = Collection<String?>("1")
}
}
tests/testData/ast/rawGenerics/file/kt-540.kt
+2 -2
View File
@@ -3,7 +3,7 @@ import java.util.LinkedList
open class Test() {
open fun main() : Unit {
var common : List<String?>? = LinkedList<String?>()
var raw : List<Any?>? = LinkedList<String?>()
var superRaw : List<Any?>? = LinkedList()
var raw : List<*>? = LinkedList<String?>()
var superRaw : List<*>? = LinkedList()
}
}