diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
index 6f5134dbf04..51ad6b4afe1 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
@@ -206,11 +206,11 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito
AnnotationDescriptor deprecated = getDeprecated(descriptor);
if (deprecated != null) {
if (isWarning) {
- holder.createInfoAnnotation(element, composeTooltipString(descriptor, deprecated))
+ holder.createWarningAnnotation(element, composeTooltipString(descriptor, deprecated))
.setTextAttributes(CodeInsightColors.WARNINGS_ATTRIBUTES);
}
else {
- holder.createInfoAnnotation(element, composeTooltipString(descriptor, deprecated))
+ holder.createWarningAnnotation(element, composeTooltipString(descriptor, deprecated))
.setTextAttributes(CodeInsightColors.DEPRECATED_ATTRIBUTES);
}
return true;
diff --git a/idea/testData/highlighter/deprecated/Class.kt b/idea/testData/highlighter/deprecated/Class.kt
index 73728d639c7..f5d23b564d2 100644
--- a/idea/testData/highlighter/deprecated/Class.kt
+++ b/idea/testData/highlighter/deprecated/Class.kt
@@ -1,15 +1,17 @@
package test
-import java.util.ArrayList
+import java.util.ArrayList
-deprecated("Use A instead") open class MyClass {}
+deprecated("Use A instead") open class MyClass {}
fun test() {
- val a : MyClass? = null
- val b = MyClass()
- val c = ArrayList<MyClass>()
+ val a : MyClass? = null
+ val b = MyClass()
+ val c = ArrayList<MyClass>()
+
+ a == b && a == c
}
-class Test(): MyClass() {}
+class Test(): MyClass() {}
-class Test2(param: MyClass) {}
\ No newline at end of file
+class Test2(param: MyClass) {}
diff --git a/idea/testData/highlighter/deprecated/ClassObject.kt b/idea/testData/highlighter/deprecated/ClassObject.kt
index dc339ad9107..d3c8e0cc9ae 100644
--- a/idea/testData/highlighter/deprecated/ClassObject.kt
+++ b/idea/testData/highlighter/deprecated/ClassObject.kt
@@ -1,19 +1,21 @@
fun test() {
- MyClass.test
+ MyClass.test
MyClass()
val a: MyClass? = null
val b: MyTrait? = null
- MyTrait.test
+ MyTrait.test
+
+ a == b
}
class MyClass(): MyTrait {
deprecated("Use A instead") class object {
- val test: String = ""
+ val test: String = ""
}
}
trait MyTrait {
deprecated("Use A instead") class object {
- val test: String = ""
+ val test: String = ""
}
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Function.kt b/idea/testData/highlighter/deprecated/Function.kt
index c3eab1a3a09..f81917c2a38 100644
--- a/idea/testData/highlighter/deprecated/Function.kt
+++ b/idea/testData/highlighter/deprecated/Function.kt
@@ -1,13 +1,13 @@
fun test() {
- test1()
- MyClass().test2()
- MyClass.test3()
+ test1()
+ MyClass().test2()
+ MyClass.test3()
- test4(1, 2)
+ test4(1, 2)
}
deprecated("Use A instead") fun test1() { }
-deprecated("Use A instead") fun test4(x: Int, y: Int) { }
+deprecated("Use A instead") fun test4(x: Int, y: Int) { x + y }
class MyClass() {
deprecated("Use A instead") fun test2() {}
diff --git a/idea/testData/highlighter/deprecated/Get.kt b/idea/testData/highlighter/deprecated/Get.kt
index b162a37f573..8f1d3a179da 100644
--- a/idea/testData/highlighter/deprecated/Get.kt
+++ b/idea/testData/highlighter/deprecated/Get.kt
@@ -1,10 +1,10 @@
class MyClass {}
-deprecated("Use A instead") fun MyClass.get(i: MyClass): MyClass { return MyClass() }
+deprecated("Use A instead") fun MyClass.get(i: MyClass): MyClass { return i }
fun test() {
val x1 = MyClass()
val x2 = MyClass()
- x1[x2]
+ x1[x2]
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Getter.kt b/idea/testData/highlighter/deprecated/Getter.kt
index c769b5ac755..16b9efc72a6 100644
--- a/idea/testData/highlighter/deprecated/Getter.kt
+++ b/idea/testData/highlighter/deprecated/Getter.kt
@@ -1,19 +1,19 @@
fun test() {
val c = MyClass()
- c.test1
- c.test2
+ c.test1
+ c.test2
c.test2 = ""
- c.test3
+ c.test3
}
class MyClass() {
- public val test1: String = ""
- [deprecated("Use A instead")] get
+ public val test1: String = ""
+ [deprecated("Use A instead")] get
- public var test2: String = ""
- [deprecated("Use A instead")] get
+ public var test2: String = ""
+ [deprecated("Use A instead")] get
- deprecated("Use A instead") public val test3: String = ""
- [deprecated("Use A instead")] get
+ deprecated("Use A instead") public val test3: String = ""
+ [deprecated("Use A instead")] get
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Inc.kt b/idea/testData/highlighter/deprecated/Inc.kt
index 47ff2eba1ef..a579853f0ff 100644
--- a/idea/testData/highlighter/deprecated/Inc.kt
+++ b/idea/testData/highlighter/deprecated/Inc.kt
@@ -1,8 +1,11 @@
-class MyClass {}
+class MyClass {
+ val i = 0
+}
deprecated("Use A instead") fun MyClass.inc(): MyClass { return MyClass() }
fun test() {
var x3 = MyClass()
- x3++
+ x3++
+ x3.i
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Invoke.kt b/idea/testData/highlighter/deprecated/Invoke.kt
index 16c156c7714..6c2fadc85f4 100644
--- a/idea/testData/highlighter/deprecated/Invoke.kt
+++ b/idea/testData/highlighter/deprecated/Invoke.kt
@@ -5,5 +5,5 @@ deprecated("Use A instead") fun MyRunnable.invoke() {
fun test() {
val m = MyRunnable()
- m()
+ m()
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Operation.kt b/idea/testData/highlighter/deprecated/Operation.kt
index 67aee0fb785..84ef7ccff7e 100644
--- a/idea/testData/highlighter/deprecated/Operation.kt
+++ b/idea/testData/highlighter/deprecated/Operation.kt
@@ -1,36 +1,38 @@
-class MyClass {}
+class MyClass {
+ val i = 0
+}
-deprecated("Use A instead") fun MyClass.minus(i: MyClass) { }
-deprecated("Use A instead") fun MyClass.div(i: MyClass) { }
-deprecated("Use A instead") fun MyClass.times(i: MyClass) { }
+deprecated("Use A instead") fun MyClass.minus(i: MyClass) { i.i }
+deprecated("Use A instead") fun MyClass.div(i: MyClass) { i.i }
+deprecated("Use A instead") fun MyClass.times(i: MyClass) { i.i }
deprecated("Use A instead") fun MyClass.not() { }
deprecated("Use A instead") fun MyClass.plus() { }
-deprecated("Use A instead") fun MyClass.contains(i: MyClass): Boolean { return false }
+deprecated("Use A instead") fun MyClass.contains(i: MyClass): Boolean { i.i; return false }
-deprecated("Use A instead") fun MyClass.plusAssign(i: MyClass) { }
+deprecated("Use A instead") fun MyClass.plusAssign(i: MyClass) { i.i }
-deprecated("Use A instead") fun MyClass.equals(i: Any?): Boolean { return false }
-deprecated("Use A instead") fun MyClass.compareTo(i: MyClass): Int { return 0 }
+deprecated("Use A instead") fun MyClass.equals(i: Any?): Boolean { i == null; return false }
+deprecated("Use A instead") fun MyClass.compareTo(i: MyClass): Int { return i.i }
fun test() {
val x1 = MyClass()
val x2 = MyClass()
- x1 - x2
- x1 / x2
- x1 * x2
+ x1 - x2
+ x1 / x2
+ x1 * x2
- !x1
- +x1
+ !x1
+ +x1
- x1 in x2
- x1 !in x2
+ x1 in x2
+ x1 !in x2
- x1 += x2
+ x1 += x2
- x1 == x2
- x1 != x2
- x1 > x2
+ x1 == x2
+ x1 != x2
+ x1 > x2
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Property.kt b/idea/testData/highlighter/deprecated/Property.kt
index 4023eaa37f0..fb1ef53600e 100644
--- a/idea/testData/highlighter/deprecated/Property.kt
+++ b/idea/testData/highlighter/deprecated/Property.kt
@@ -1,22 +1,22 @@
fun test() {
- test1
- MyClass().test2
- MyClass.test3
+ test1 == ""
+ MyClass().test2
+ MyClass.test3
- test4
- MyClass().test5
- MyClass.test6
+ test4 == ""
+ MyClass().test5
+ MyClass.test6
}
-deprecated("Use A instead") val test1: String = ""
-deprecated("Use A instead") var test4: String = ""
+deprecated("Use A instead") val test1: String = ""
+deprecated("Use A instead") var test4: String = ""
class MyClass() {
- deprecated("Use A instead") val test2: String = ""
- deprecated("Use A instead") var test5: String = ""
+ deprecated("Use A instead") val test2: String = ""
+ deprecated("Use A instead") var test5: String = ""
class object {
- deprecated("Use A instead") val test3: String = ""
- deprecated("Use A instead") var test6: String = ""
+ deprecated("Use A instead") val test3: String = ""
+ deprecated("Use A instead") var test6: String = ""
}
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/RangeTo.kt b/idea/testData/highlighter/deprecated/RangeTo.kt
index 19adfe7fcfd..36e0141f9e0 100644
--- a/idea/testData/highlighter/deprecated/RangeTo.kt
+++ b/idea/testData/highlighter/deprecated/RangeTo.kt
@@ -1,6 +1,9 @@
-class MyClass { }
+class MyClass {
+ val i = 1
+}
deprecated("Use A instead") fun MyClass.rangeTo(i: MyClass): IntIterator {
+ i.i
throw Exception()
}
@@ -8,7 +11,7 @@ fun test() {
val x1 = MyClass()
val x2 = MyClass()
- for (i in x1..x2) {
+ for (i in x1..x2) {
}
}
diff --git a/idea/testData/highlighter/deprecated/Setter.kt b/idea/testData/highlighter/deprecated/Setter.kt
index e5cd95284fa..28b08c2635c 100644
--- a/idea/testData/highlighter/deprecated/Setter.kt
+++ b/idea/testData/highlighter/deprecated/Setter.kt
@@ -1,26 +1,26 @@
fun test() {
MyClass().test1
- MyClass().test1 = 0
+ MyClass().test1 = 0
- MyClass().test1++
- MyClass().test1--
+ MyClass().test1++
+ MyClass().test1--
- ++MyClass().test1
- --MyClass().test1
+ ++MyClass().test1
+ --MyClass().test1
- MyClass().test1 += 1
- MyClass().test1 -= 1
- MyClass().test1 /= 1
- MyClass().test1 *= 1
+ MyClass().test1 += 1
+ MyClass().test1 -= 1
+ MyClass().test1 /= 1
+ MyClass().test1 *= 1
- test2
- test2 = 10
+ test2 + 1
+ test2 = 10
}
class MyClass() {
- public var test1: Int = 0
- [deprecated("Use A instead")] set
+ public var test1: Int = 0
+ [deprecated("Use A instead")] set
}
-public var test2: Int = 0
- [deprecated("Use A instead")] set
\ No newline at end of file
+public var test2: Int = 0
+ [deprecated("Use A instead")] set
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/SuperCall.kt b/idea/testData/highlighter/deprecated/SuperCall.kt
index 55e7cc3d4d5..27ae615504d 100644
--- a/idea/testData/highlighter/deprecated/SuperCall.kt
+++ b/idea/testData/highlighter/deprecated/SuperCall.kt
@@ -4,6 +4,6 @@ class MyClass(): Base() {
}
}
-open class Base() {
+open class Base() {
fun test1() {}
}
\ No newline at end of file
diff --git a/idea/testData/highlighter/deprecated/Trait.kt b/idea/testData/highlighter/deprecated/Trait.kt
index cfa3ee69032..ca10814e0e4 100644
--- a/idea/testData/highlighter/deprecated/Trait.kt
+++ b/idea/testData/highlighter/deprecated/Trait.kt
@@ -1,10 +1,11 @@
deprecated("Use A instead") trait MyTrait { }
fun test() {
- val a: MyTrait? = null
- val b: List<MyTrait>? = null
+ val a: MyTrait? = null
+ val b: List<MyTrait>? = null
+ a == b
}
-class Test(): MyTrait { }
+class Test(): MyTrait { }
-class Test2(param: MyTrait) {}
\ No newline at end of file
+class Test2(param: MyTrait) {}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDeprecatedHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDeprecatedHighlightingTest.java
index d9d165a52b5..9245d805d5b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDeprecatedHighlightingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDeprecatedHighlightingTest.java
@@ -13,12 +13,12 @@ public abstract class AbstractDeprecatedHighlightingTest extends LightDaemonAnal
}
protected void doTest(String filePath) throws Exception {
- doTest(getTestName(false) + ".kt", false, true);
+ doTest(filePath, true, false);
}
@NotNull
@Override
protected String getTestDataPath() {
- return PluginTestCaseBase.getTestDataPathBase() + "/highlighter/deprecated/";
+ return "";
}
}
\ No newline at end of file