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

Merge two deprecation diagnostics into one DEPRECATION

Browse Source 
This also fixes weird suppressions in user code: instead of
«@Suppress("DEPRECATED_SYMBOL_WITH_MESSAGE")» you should now use
«@Suppress("DEPRECATION")»
This commit is contained in:
Alexander Udalov
2015-10-07 22:10:59 +03:00
committed by Andrey Breslav
parent c817949221
commit 34267e436e
39 changed files with 162 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/Underscore.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
// !DIAGNOSTICS: -DEPRECATED_SYMBOL_WITH_MESSAGE
// !DIAGNOSTICS: -DEPRECATION
<!UNDERSCORE_IS_DEPRECATED!>import kotlin.Deprecated as ___<!>
@@ -13,4 +13,4 @@ fun <!UNDERSCORE_IS_DEPRECATED!>__<!>(<!UNDERSCORE_IS_DEPRECATED!>___<!>: Int, y
// in backquotes: allowed
val `_` = __________
<!UNDERSCORE_IS_DEPRECATED!>__<!>@ return if (y != null) __(____, y) else __(`_`, ______)
}
}
compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt
Vendored
+2 -2
View File
@@ -4,6 +4,6 @@ annotation class obsolete()
@Deprecated("text")
annotation class obsoleteWithParam(val text: String)
@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>obsolete<!> class Obsolete
@<!DEPRECATION!>obsolete<!> class Obsolete
@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>obsoleteWithParam<!>("text") class Obsolete2
@<!DEPRECATION!>obsoleteWithParam<!>("text") class Obsolete2
compiler/testData/diagnostics/tests/deprecated/componentUsage.kt
Vendored
+2 -2
View File
@@ -7,5 +7,5 @@ class Data {
}
fun use() {
val (<!DEPRECATED_SYMBOL_WITH_MESSAGE!>x<!>, y) = Data()
}
val (<!DEPRECATION!>x<!>, y) = Data()
}
compiler/testData/diagnostics/tests/deprecated/functionUsage.kt
Vendored
+11 -11
View File
@@ -22,28 +22,28 @@ object InvocableHolder {
fun invoker() {
val invocable = Invocable()
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>invocable<!>()
InvocableHolder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>invocable<!>()
<!DEPRECATION!>invocable<!>()
InvocableHolder.<!DEPRECATION!>invocable<!>()
}
fun block() {
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>(2)
<!DEPRECATION!>Obsolete<!>()
<!DEPRECATION!>Obsolete<!>(2)
}
fun expression() = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
fun expression() = <!DEPRECATION!>Obsolete<!>()
fun reflection() = ::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
fun reflection2() = UsefulClass::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>member<!>
fun reflection() = ::<!DEPRECATION!>Obsolete<!>
fun reflection2() = UsefulClass::<!DEPRECATION!>member<!>
class Initializer {
val x = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
val x = <!DEPRECATION!>Obsolete<!>()
}
@Deprecated("does nothing good")
fun Any.doNothing() = this.toString() // "this" should not be marked as deprecated despite it referes to deprecated function
class Delegation {
val x by <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
var y by <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
}
val x by <!DEPRECATION!>Obsolete<!>()
var y by <!DEPRECATION!>Obsolete<!>()
}
compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ open class C<T>() {
constructor(p: Int) : this(){}
}
class D : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C<String><!>(1)
class D : <!DEPRECATION!>C<String><!>(1)
compiler/testData/diagnostics/tests/deprecated/imports.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
import <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C<!> as C2
import <!DEPRECATION!>C<!> as C2
@Deprecated("obsolete")
class C {
fun use() {}
}
fun useAlias(c : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C2<!>) { c.use() }
fun useAlias(c : <!DEPRECATION!>C2<!>) { c.use() }
compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt
Vendored
+3 -3
View File
@@ -19,6 +19,6 @@ class Iter2 {
}
fun use() {
for (x in <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Iter()<!>) {}
for (x in <!DEPRECATED_SYMBOL_WITH_MESSAGE, DEPRECATED_SYMBOL_WITH_MESSAGE!>Iter2()<!>) {}
}
for (x in <!DEPRECATION!>Iter()<!>) {}
for (x in <!DEPRECATION, DEPRECATION!>Iter2()<!>) {}
}
compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt
Vendored
+3 -3
View File
@@ -11,6 +11,6 @@ public class A {
// FILE: B.kt
class B(private @property:Deprecated val foo: String) : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>A<!>() {
override fun getFoo(text: String): String = super.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>getFoo<!>(text + <!DEPRECATED_SYMBOL!>foo<!>)
}
class B(private @property:Deprecated val foo: String) : <!DEPRECATION!>A<!>() {
override fun getFoo(text: String): String = super.<!DEPRECATION!>getFoo<!>(text + <!DEPRECATION!>foo<!>)
}
compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt
Vendored
+2 -2
View File
@@ -15,6 +15,6 @@ public class A {
// FILE: B.kt
class B(private val foo: String) : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>A<!>() {
override fun getFoo(text: String): String = super.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>getFoo<!>(text + foo)
class B(private val foo: String) : <!DEPRECATION!>A<!>() {
override fun getFoo(text: String): String = super.<!DEPRECATION!>getFoo<!>(text + foo)
}
compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt
Vendored
+4 -4
View File
@@ -12,7 +12,7 @@ class TopLevel {
}
fun useNested() {
val <!UNUSED_VARIABLE!>d<!> = TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.use()
TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.Nested2()
TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.<!UNRESOLVED_REFERENCE!>CompanionNested2<!>()
}
val <!UNUSED_VARIABLE!>d<!> = TopLevel.<!DEPRECATION!>Nested<!>.use()
TopLevel.<!DEPRECATION!>Nested<!>.Nested2()
TopLevel.<!DEPRECATION!>Nested<!>.<!UNRESOLVED_REFERENCE!>CompanionNested2<!>()
}
compiler/testData/diagnostics/tests/deprecated/objectUsage.kt
Vendored
+8 -8
View File
@@ -11,17 +11,17 @@ class Another {
}
fun first() {
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>.use()
<!DEPRECATION!>Another<!>.use()
}
fun useObject() {
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.use()
val <!UNUSED_VARIABLE!>x<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
<!DEPRECATION!>Obsolete<!>.use()
val <!UNUSED_VARIABLE!>x<!> = <!DEPRECATION!>Obsolete<!>
}
fun useCompanion() {
val <!UNUSED_VARIABLE!>d<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>
val <!UNUSED_VARIABLE!>x<!> = Another.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Companion<!>
Another.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Companion<!>.use()
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>.use()
}
val <!UNUSED_VARIABLE!>d<!> = <!DEPRECATION!>Another<!>
val <!UNUSED_VARIABLE!>x<!> = Another.<!DEPRECATION!>Companion<!>
Another.<!DEPRECATION!>Companion<!>.use()
<!DEPRECATION!>Another<!>.use()
}
compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
Vendored
+14 -14
View File
@@ -15,8 +15,8 @@ class PropertyHolder {
@Deprecated("text")
var name = "String"
val valDelegate <!DEPRECATED_SYMBOL_WITH_MESSAGE!>by<!> Delegate()
var varDelegate <!DEPRECATED_SYMBOL_WITH_MESSAGE, DEPRECATED_SYMBOL_WITH_MESSAGE!>by<!> Delegate()
val valDelegate <!DEPRECATION!>by<!> Delegate()
var varDelegate <!DEPRECATION, DEPRECATION!>by<!> Delegate()
public val test1: String = ""
@Deprecated("val-getter") get
@@ -35,24 +35,24 @@ class PropertyHolder {
}
fun PropertyHolder.extFunction() {
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!> = "ext"
<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test1<!>
<!DEPRECATION!>test2<!> = "ext"
<!DEPRECATION!>test1<!>
}
fun fn() {
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test1<!>
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!>
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!> = ""
PropertyHolder().<!DEPRECATION!>test1<!>
PropertyHolder().<!DEPRECATION!>test2<!>
PropertyHolder().<!DEPRECATION!>test2<!> = ""
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test3<!>
PropertyHolder().<!DEPRECATION!>test3<!>
PropertyHolder().test3 = ""
PropertyHolder().test4
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test4<!> = ""
PropertyHolder().<!DEPRECATION!>test4<!> = ""
val <!UNUSED_VARIABLE!>a<!> = PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>x<!>
val <!UNUSED_VARIABLE!>b<!> = PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!>
PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!> = "value"
val <!UNUSED_VARIABLE!>a<!> = PropertyHolder().<!DEPRECATION!>x<!>
val <!UNUSED_VARIABLE!>b<!> = PropertyHolder().<!DEPRECATION!>name<!>
PropertyHolder().<!DEPRECATION!>name<!> = "value"
val <!UNUSED_VARIABLE!>d<!> = PropertyHolder().valDelegate
PropertyHolder().varDelegate = 1
@@ -60,5 +60,5 @@ fun fn() {
fun literals() {
PropertyHolder::test1
PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!>
}
PropertyHolder::<!DEPRECATION!>name<!>
}
compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt
Vendored
+7 -7
View File
@@ -17,15 +17,15 @@ class PropertyHolder {
fun fn() {
val holder = PropertyHolder()
holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a1<!>
holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a2<!>
holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>withGetter<!>
holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>withSetter<!> = "A"
holder.<!DEPRECATION!>a1<!>
holder.<!DEPRECATION!>a2<!>
holder.<!DEPRECATION!>withGetter<!>
holder.<!DEPRECATION!>withSetter<!> = "A"
}
fun literals() {
PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a1<!>
PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a2<!>
PropertyHolder::<!DEPRECATION!>a1<!>
PropertyHolder::<!DEPRECATION!>a2<!>
PropertyHolder::withGetter
PropertyHolder::withSetter
}
}
compiler/testData/diagnostics/tests/deprecated/typeUsage.kt
Vendored
+15 -15
View File
@@ -10,33 +10,33 @@ open class Obsolete2 @Deprecated("Constructor") constructor() {
interface Generic<T>
open class Derived() : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
open class Derived() : <!DEPRECATION!>Obsolete<!>()
class Derived2() : Derived()
class TypeParam : Generic<<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>>
class TypeParam : Generic<<!DEPRECATION!>Obsolete<!>>
object Object : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
object Object : <!DEPRECATION!>Obsolete<!>()
class Properties {
val x : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
var y : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
val x : <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
var y : <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
var n : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
get() = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
var n : <!DEPRECATION!>Obsolete<!>
get() = <!DEPRECATION!>Obsolete<!>()
set(value) {}
}
fun param(param: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>) { param.use() }
fun param(param: <!DEPRECATION!>Obsolete<!>) { param.use() }
fun funcParamReceiver(param: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.()->Unit) { <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>().param() }
fun funcParamParam(param: (<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>)->Unit) { param(<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()) }
fun funcParamRetVal(param: ()-><!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>) { param() }
fun funcParamReceiver(param: <!DEPRECATION!>Obsolete<!>.()->Unit) { <!DEPRECATION!>Obsolete<!>().param() }
fun funcParamParam(param: (<!DEPRECATION!>Obsolete<!>)->Unit) { param(<!DEPRECATION!>Obsolete<!>()) }
fun funcParamRetVal(param: ()-><!DEPRECATION!>Obsolete<!>) { param() }
fun <T: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>> constraint() {}
fun <T: <!DEPRECATION!>Obsolete<!>> constraint() {}
fun <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.receiver() {}
fun <!DEPRECATION!>Obsolete<!>.receiver() {}
fun retVal(): <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
fun retVal(): <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
fun nullableRetVal(): <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>? = null
fun nullableRetVal(): <!DEPRECATION!>Obsolete<!>? = null
compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// No supertype at all
class A1 {
fun test() {
<!SUPER_CANT_BE_EXTENSION_RECEIVER!>super<!>.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>identityEquals<!>(null) // Call to an extension function
<!SUPER_CANT_BE_EXTENSION_RECEIVER!>super<!>.<!DEPRECATION!>identityEquals<!>(null) // Call to an extension function
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> constructor(s: String) {
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> constructor(s: String) {
}
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> private fun foo(s: String = "OK") {
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> private fun foo(s: String = "OK") {
}
}
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!>
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!>
fun foo() {
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> val <!UNUSED_VARIABLE!>x<!> = "A"
}
<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> val <!UNUSED_VARIABLE!>x<!> = "A"
}
compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
class C {
private <!INAPPLICABLE_PUBLIC_FIELD!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>publicField<!><!> val a: String by lazy { "A" }
}
private <!INAPPLICABLE_PUBLIC_FIELD!>@<!DEPRECATION!>publicField<!><!> val a: String by lazy { "A" }
}
compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATED_SYMBOL_WITH_MESSAGE
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATION
inline fun<reified T> foo(block: () -> T): String = block().toString()