Drop external annotations support in build tools

External annotations will only be considered in the IDE for additional
inspections based on more precise types in Java libraries
This commit is contained in:
Alexander Udalov
2015-04-24 19:22:37 +03:00
committed by Dmitry Jemerov
parent f2efd30a5d
commit 13c54a2678
105 changed files with 39 additions and 1148 deletions
@@ -1,32 +0,0 @@
// !CHECK_TYPE
package kotlin1
import java.util.*
fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
val al1 = ArrayList<Int>(1)
// for (x in al1) {
//
// }
val <!UNUSED_VARIABLE!>al2<!> = ArrayList<Int>(ArrayList<Int>())
checkSubtype<RandomAccess>(al)
checkSubtype<Unit>(al.clear())
checkSubtype<Boolean>(al.add(1))
checkSubtype<Unit>(al.add(0, 1))
checkSubtype<Boolean>(al.addAll(al1))
checkSubtype<Boolean>(al.addAll(0, al1))
checkSubtype<Int>(al.get(0))
val m = HashMap<String, Int>()
m.put("", 1)
test(al, m)
}
fun test(a : List<Int>, m : Map<String, Int>) {
System.out.println(
a.get(0) + 1
)
HashMap<Int, Int>().get(0)
if (m.get("") != null)
System.out.println(m.get("")!!.plus(1))
}
@@ -1,6 +0,0 @@
package
package kotlin1 {
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public fun test(/*0*/ a: kotlin.List<kotlin.Int>, /*1*/ m: kotlin.Map<kotlin.String, kotlin.Int>): kotlin.Unit
}
@@ -1,10 +0,0 @@
// !CHECK_TYPE
package kotlin1
import java.util.*
fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
checkSubtype<Any>(al.clone()) // A type mismatch on this line means that jdk-annotations were not loaded
}
@@ -1,5 +0,0 @@
package
package kotlin1 {
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
}
@@ -1,14 +0,0 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_PARAMETER
package kotlin1
import java.util.*
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
// A type mismatch on this line means that jdk-annotations were not loaded
checkSubtype<Array<Int>>(al.toArray(Array<Int>(3, {1})))
}
@@ -1,6 +0,0 @@
package
package kotlin1 {
@kotlin.inline() public fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
}
@@ -1,34 +0,0 @@
// !CHECK_TYPE
import java.sql.DriverManager
fun getConnection(url: String?) {
DriverManager.getConnection(url)
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url!!))
}
fun getConnection(url: String?, props: java.util.Properties?) {
DriverManager.getConnection(url, props)
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url!!, props))
}
fun getConnection(url: String?, user: String?, password: String?) {
DriverManager.getConnection(url, user!!, password!!)
DriverManager.getConnection(url!!, user, password<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
DriverManager.getConnection(url<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, user<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, password)
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, user<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, password<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>))
}
fun getDriver(url: String?) {
DriverManager.getDriver(url)
checkSubtype<java.sql.Driver>(DriverManager.getDriver(url!!))
}
fun registerDriver(driver: java.sql.Driver?) {
DriverManager.registerDriver(driver)
DriverManager.registerDriver(driver!!)
}
fun getDrivers() {
checkSubtype<java.util.Enumeration<java.sql.Driver>>(DriverManager.getDrivers())
}
@@ -1,8 +0,0 @@
package
public fun getConnection(/*0*/ url: kotlin.String?): kotlin.Unit
public fun getConnection(/*0*/ url: kotlin.String?, /*1*/ props: java.util.Properties?): kotlin.Unit
public fun getConnection(/*0*/ url: kotlin.String?, /*1*/ user: kotlin.String?, /*2*/ password: kotlin.String?): kotlin.Unit
public fun getDriver(/*0*/ url: kotlin.String?): kotlin.Unit
public fun getDrivers(): kotlin.Unit
public fun registerDriver(/*0*/ driver: java.sql.Driver?): kotlin.Unit
@@ -1,5 +0,0 @@
// !CHECK_TYPE
fun getMetaData(rs: java.sql.ResultSet) {
checkSubtype<java.sql.ResultSetMetaData>(rs.getMetaData())
}
@@ -1,3 +0,0 @@
package
public fun getMetaData(/*0*/ rs: java.sql.ResultSet): kotlin.Unit
@@ -1,15 +0,0 @@
// !CHECK_TYPE
fun executeQuery(statement: java.sql.Statement, cmd: String?) {
statement.executeQuery(cmd)
checkSubtype<java.sql.ResultSet>(statement.executeQuery(cmd!!))
}
fun executeQuery(statement: java.sql.PreparedStatement) {
checkSubtype<java.sql.ResultSet>(statement.executeQuery())
}
fun executeUpdate(statement: java.sql.Statement, cmd: String?) {
statement.executeUpdate(cmd)
statement.executeUpdate(cmd!!)
}
@@ -1,5 +0,0 @@
package
public fun executeQuery(/*0*/ statement: java.sql.PreparedStatement): kotlin.Unit
public fun executeQuery(/*0*/ statement: java.sql.Statement, /*1*/ cmd: kotlin.String?): kotlin.Unit
public fun executeUpdate(/*0*/ statement: java.sql.Statement, /*1*/ cmd: kotlin.String?): kotlin.Unit