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
idea/testData/highlighter/deprecated/Class.kt
Vendored
+5 -5
View File
@@ -5,16 +5,16 @@ import java.util.ArrayList
@Deprecated("Use A instead") open class MyClass {}
fun test() {
val a : <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>? = null
val b = <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>()
val c = ArrayList<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>>()
val a : <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>? = null
val b = <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>()
val c = ArrayList<<warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>>()
a == b && a == c
}
class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>() {}
class Test(): <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>() {}
class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>) {}
class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>) {}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/ClassObject.kt
Vendored
+7 -7
View File
@@ -1,13 +1,13 @@
fun test() {
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
MyClass()
val a: MyClass? = null
val b: MyTrait? = null
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">test</warning>
MyTrait.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">test</warning>
MyTrait.<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
a == b
}
@@ -25,4 +25,4 @@ interface MyTrait {
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Function.kt
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
fun test() {
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1(): Unit' is deprecated. Use A instead">test1</warning>()
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2(): Unit' is deprecated. Use A instead">test2</warning>()
MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3(): Unit' is deprecated. Use A instead">test3</warning>()
<warning descr="[DEPRECATION] 'test1(): Unit' is deprecated. Use A instead">test1</warning>()
MyClass().<warning descr="[DEPRECATION] 'test2(): Unit' is deprecated. Use A instead">test2</warning>()
MyClass.<warning descr="[DEPRECATION] 'test3(): Unit' is deprecated. Use A instead">test3</warning>()
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4(Int, Int): Unit' is deprecated. Use A instead">test4</warning>(1, 2)
<warning descr="[DEPRECATION] 'test4(Int, Int): Unit' is deprecated. Use A instead">test4</warning>(1, 2)
}
@Deprecated("Use A instead") fun test1() { }
@@ -18,4 +18,4 @@ class MyClass() {
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Get.kt
Vendored
+2 -2
View File
@@ -6,8 +6,8 @@ fun test() {
val x1 = MyClass()
val x2 = MyClass()
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'get(MyClass): MyClass' is deprecated. Use A instead">x1[x2]</warning>
<warning descr="[DEPRECATION] 'get(MyClass): MyClass' is deprecated. Use A instead">x1[x2]</warning>
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Getter.kt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
fun test() {
val c = MyClass()
c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test1: String' is deprecated. Use A instead">test1</warning>
c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test2: String' is deprecated. Use A instead">test2</warning>
c.<warning descr="[DEPRECATION] 'getter for test1: String' is deprecated. Use A instead">test1</warning>
c.<warning descr="[DEPRECATION] 'getter for test2: String' is deprecated. Use A instead">test2</warning>
c.test2 = ""
c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
c.<warning descr="[DEPRECATION] 'test3: String' is deprecated. Use A instead">test3</warning>
}
class MyClass() {
@@ -19,4 +19,4 @@ class MyClass() {
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Inc.kt
Vendored
+2 -2
View File
@@ -6,9 +6,9 @@ class MyClass {
fun test() {
var x3 = MyClass()
x3<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'inc(): MyClass' is deprecated. Use A instead">++</warning>
x3<warning descr="[DEPRECATION] 'inc(): MyClass' is deprecated. Use A instead">++</warning>
x3.i
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Invalid.kt
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@ fun foo() {}
@Deprecated(<error>false</error>)
fun boo() {}
fun far() = <warning descr="[DEPRECATED_SYMBOL] 'foo(): Unit' is deprecated.">foo</warning>()
fun far() = <warning descr="[DEPRECATION] 'foo(): Unit' is deprecated. ">foo</warning>()
fun bar() = <warning descr="[DEPRECATED_SYMBOL] 'boo(): Unit' is deprecated.">boo</warning>()
fun bar() = <warning descr="[DEPRECATION] 'boo(): Unit' is deprecated. ">boo</warning>()
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Invoke.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ class MyRunnable() {}
fun test() {
val m = MyRunnable()
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'invoke(): Unit' is deprecated. Use A instead">m</warning>()
<warning descr="[DEPRECATION] 'invoke(): Unit' is deprecated. Use A instead">m</warning>()
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Operation.kt
Vendored
+10 -10
View File
@@ -19,20 +19,20 @@ fun test() {
val x1 = MyClass()
val x2 = MyClass()
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'minus(MyClass): Unit' is deprecated. Use A instead">-</warning> x2
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'div(MyClass): Unit' is deprecated. Use A instead">/</warning> x2
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'times(MyClass): Unit' is deprecated. Use A instead">*</warning> x2
x1 <warning descr="[DEPRECATION] 'minus(MyClass): Unit' is deprecated. Use A instead">-</warning> x2
x1 <warning descr="[DEPRECATION] 'div(MyClass): Unit' is deprecated. Use A instead">/</warning> x2
x1 <warning descr="[DEPRECATION] 'times(MyClass): Unit' is deprecated. Use A instead">*</warning> x2
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'not(): Unit' is deprecated. Use A instead">!</warning>x1
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plus(): Unit' is deprecated. Use A instead">+</warning>x1
<warning descr="[DEPRECATION] 'not(): Unit' is deprecated. Use A instead">!</warning>x1
<warning descr="[DEPRECATION] 'plus(): Unit' is deprecated. Use A instead">+</warning>x1
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">in</warning> x2
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">!in</warning> x2
x1 <warning descr="[DEPRECATION] 'contains(MyClass): Boolean' is deprecated. Use A instead">in</warning> x2
x1 <warning descr="[DEPRECATION] 'contains(MyClass): Boolean' is deprecated. Use A instead">!in</warning> x2
x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plusAssign(MyClass): Unit' is deprecated. Use A instead">+=</warning> x2
x1 <warning descr="[DEPRECATION] 'plusAssign(MyClass): Unit' is deprecated. Use A instead">+=</warning> x2
x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): IntRange' is deprecated. Use A instead">..</warning>x2
x1<warning descr="[DEPRECATION] 'rangeTo(MyClass): IntRange' is deprecated. Use A instead">..</warning>x2
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Property.kt
Vendored
+7 -7
View File
@@ -1,11 +1,11 @@
fun test() {
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1: String' is deprecated. Use A instead">test1</warning> == ""
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2: String' is deprecated. Use A instead">test2</warning>
MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
<warning descr="[DEPRECATION] 'test1: String' is deprecated. Use A instead">test1</warning> == ""
MyClass().<warning descr="[DEPRECATION] 'test2: String' is deprecated. Use A instead">test2</warning>
MyClass.<warning descr="[DEPRECATION] 'test3: String' is deprecated. Use A instead">test3</warning>
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4: String' is deprecated. Use A instead">test4</warning> == ""
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test5: String' is deprecated. Use A instead">test5</warning>
MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test6: String' is deprecated. Use A instead">test6</warning>
<warning descr="[DEPRECATION] 'test4: String' is deprecated. Use A instead">test4</warning> == ""
MyClass().<warning descr="[DEPRECATION] 'test5: String' is deprecated. Use A instead">test5</warning>
MyClass.<warning descr="[DEPRECATION] 'test6: String' is deprecated. Use A instead">test6</warning>
}
@Deprecated("Use A instead") val test1: String = ""
@@ -22,4 +22,4 @@ class MyClass() {
}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/RangeTo.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ fun test() {
val x1 = MyClass()
val x2 = MyClass()
for (i in x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): Iterable<Int>' is deprecated. Use A instead">..</warning>x2) {
for (i in x1<warning descr="[DEPRECATION] 'rangeTo(MyClass): Iterable<Int>' is deprecated. Use A instead">..</warning>x2) {
}
}
idea/testData/highlighter/deprecated/Setter.kt
Vendored
+11 -11
View File
@@ -1,20 +1,20 @@
fun test() {
MyClass().test1
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> = 0
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> = 0
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>++
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>--
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>++
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>--
++MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
--MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
++MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
--MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> += 1
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> -= 1
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> /= 1
MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> *= 1
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> += 1
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> -= 1
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> /= 1
MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> *= 1
test2 + 1
<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test2: Int' is deprecated. Use A instead">test2</warning> = 10
<warning descr="[DEPRECATION] 'setter for test2: Int' is deprecated. Use A instead">test2</warning> = 10
}
class MyClass() {
@@ -26,4 +26,4 @@ public var test2: Int = 0
@Deprecated("Use A instead") set
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS
idea/testData/highlighter/deprecated/Trait.kt
Vendored
+5 -5
View File
@@ -1,14 +1,14 @@
@Deprecated("Use A instead") interface MyTrait { }
fun test() {
val a: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
val b: List<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
val a: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
val b: List<<warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
a == b
}
class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
class Test(): <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
// NO_CHECK_INFOS
// NO_CHECK_WEAK_WARNINGS
// NO_CHECK_WEAK_WARNINGS