From aada13c91fad414985a25a4de6b4b8b30b7c7953 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 23 Sep 2015 21:08:02 +0300
Subject: [PATCH] Deprecate @publicField

---
 .../codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt   | 4 +---
 .../annotations/publicField/publicFieldNotOnProperty.kt   | 8 ++++----
 .../publicField/publicFieldOnDelegatedProperty.kt         | 2 +-
 libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt
index 65b7909ec06..35ba639b9a6 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt
@@ -1,7 +1,7 @@
 import java.lang.reflect.Modifier
 
 public class A {
-    private lateinit val privateField: String
+    private lateinit var privateField: String
     protected lateinit var protectedField: String
     public lateinit var publicField: String
 
@@ -13,8 +13,6 @@ public class A {
         if (!Modifier.isProtected(clazz.getDeclaredField("protectedField").modifiers)) cond += "NOT_PROTECTED"
         if (!Modifier.isPublic(clazz.getDeclaredField("publicField").modifiers)) cond += "NOT_PUBLIC"
 
-        if (Modifier.isFinal(clazz.getDeclaredField("privateField").modifiers)) cond += "FINAL"
-
         try {
             val a = privateField
         } catch (e: UninitializedPropertyAccessException) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
index ede91648b15..7f5ebd1addb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
@@ -1,16 +1,16 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class C {
 
-    <!WRONG_ANNOTATION_TARGET!>@kotlin.jvm.publicField<!> constructor(s: String) {
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> constructor(s: String) {
 
     }
 
-    <!WRONG_ANNOTATION_TARGET!>@kotlin.jvm.publicField<!> private fun foo(s: String = "OK") {
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> private fun foo(s: String = "OK") {
 
     }
 }
 
-<!WRONG_ANNOTATION_TARGET!>@kotlin.jvm.publicField<!>
+<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!>
 fun foo() {
-    <!WRONG_ANNOTATION_TARGET!>@kotlin.jvm.publicField<!> val <!UNUSED_VARIABLE!>x<!> = "A"
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> val <!UNUSED_VARIABLE!>x<!> = "A"
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
index b230058cb9e..68d0c9c0080 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
@@ -1,3 +1,3 @@
 class C {
-    private <!INAPPLICABLE_PUBLIC_FIELD!>@publicField<!> val a: String by lazy { "A" }
+    private <!INAPPLICABLE_PUBLIC_FIELD!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>publicField<!><!> val a: String by lazy { "A" }
 }
\ No newline at end of file
diff --git a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt
index 38c1487e969..74003b7582b 100644
--- a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt
+++ b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt
@@ -67,6 +67,7 @@ public annotation class JvmMultifileClass
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.SOURCE)
 @MustBeDocumented
+@Deprecated("Use lateinit instead")
 public annotation class publicField
 
 /**