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

Deprecate javaClass with replacement this::class.java.

Browse Source 
Suppress deprecation in diagnostics tests.
This commit is contained in:
Ilya Gorbunov
2017-02-03 19:19:59 +03:00
parent d6a60424a9
commit b8de78dd43
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !DIAGNOSTICS: -DEPRECATION
package test package test
class A { class A {
compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// !DIAGNOSTICS: -DEPRECATION
// KT-9078 (NPE in control flow analysis); EA-71535 // KT-9078 (NPE in control flow analysis); EA-71535
abstract class KFunctionKt9005WorkAround<out R: Any?>(private val _functionInstance: Function<R>) { abstract class KFunctionKt9005WorkAround<out R: Any?>(private val _functionInstance: Function<R>) {
private val _reflectedFunction: kotlin.reflect.KFunction<R> = _functionInstance.<!UNRESOLVED_REFERENCE!>reflect<!>() ?: throw IllegalStateException("") private val _reflectedFunction: kotlin.reflect.KFunction<R> = _functionInstance.<!UNRESOLVED_REFERENCE!>reflect<!>() ?: throw IllegalStateException("")
core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
+2 -1
View File
@@ -92,6 +92,7 @@ public val <T : Any> Class<T>.kotlin: KClass<T>
/** /**
* Returns the runtime Java class of this object. * Returns the runtime Java class of this object.
*/ */
@Deprecated("Use 'instance::class.java' instead to get java class of the instance.", ReplaceWith("this::class.java"))
public val <T: Any> T.javaClass : Class<T> public val <T: Any> T.javaClass : Class<T>
@Suppress("UsePropertyAccessSyntax") @Suppress("UsePropertyAccessSyntax")
get() = (this as java.lang.Object).getClass() as Class<T> get() = (this as java.lang.Object).getClass() as Class<T>
@@ -107,7 +108,7 @@ public val <T: Any> KClass<T>.javaClass: Class<KClass<T>>
*/ */
@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE") @Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
public fun <reified T : Any> Array<*>.isArrayOf(): Boolean = public fun <reified T : Any> Array<*>.isArrayOf(): Boolean =
T::class.java.isAssignableFrom(this.javaClass.componentType) T::class.java.isAssignableFrom(this::class.java.componentType)
/** /**
* Returns a [KClass] instance corresponding to the annotation type of this annotation. * Returns a [KClass] instance corresponding to the annotation type of this annotation.