diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java index 1c3dde602ee..74802ddced3 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java index d1331be5694..0bdbc770324 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesEqualityByPsiForLibraryTestGenerated extends Abst runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java index 48d87b3e426..530989d2a02 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesParentingByPsiForLibraryTestGenerated extends Abs runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java index 2609ea199b8..b08974d1219 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByPsiForSourceTestGenerated.java index c9a71512845..2ee0b7fda75 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByPsiForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByPsiForSourceTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesEqualityByPsiForSourceTestGenerated extends Abstr runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByPsiForSourceTestGenerated.java index db2c73823f2..895bf83491b 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByPsiForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByPsiForSourceTestGenerated.java @@ -132,6 +132,36 @@ public class SymbolLightClassesParentingByPsiForSourceTestGenerated extends Abst runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt"); } + @Test + @TestMetadata("deprecatedHiddenProperty_accessors.kt") + public void testDeprecatedHiddenProperty_accessors() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_getter.kt") + public void testDeprecatedHiddenProperty_getter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_interface.kt") + public void testDeprecatedHiddenProperty_interface() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_noAccessor.kt") + public void testDeprecatedHiddenProperty_noAccessor() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt"); + } + + @Test + @TestMetadata("deprecatedHiddenProperty_setter.kt") + public void testDeprecatedHiddenProperty_setter() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt"); + } + @Test @TestMetadata("dollarsInNameLocal.kt") public void testDollarsInNameLocal() throws Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.descriptors.java new file mode 100644 index 00000000000..b9ccc8690fe --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.descriptors.java @@ -0,0 +1,20 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_accessors; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_accessors();// getPNew_accessors() + + public Test();// .ctor() + + public final void setPNew_accessors(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_accessors(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java new file mode 100644 index 00000000000..896314d9a3c --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java @@ -0,0 +1,22 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_accessors = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnGetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnSetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_accessors();// getPNew_accessors() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_accessors_deprecatedOnSetter();// getPOld_accessors_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_accessors(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_accessors(java.lang.String) + + public final void setPOld_accessors_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_accessors_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt new file mode 100644 index 00000000000..57be5d54487 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.kt @@ -0,0 +1,38 @@ +package test.pkg + +class Test { + @Deprecated("no more property", level = DeprecationLevel.HIDDEN) + var pOld_accessors_deprecatedOnProperty: String? = null + get() = field ?: "null?" + set(value) { + if (field == null) { + field = value + } + } + + @get:Deprecated("no more getter", level = DeprecationLevel.HIDDEN) + var pOld_accessors_deprecatedOnGetter: String? = null + get() = field ?: "null?" + set(value) { + if (field == null) { + field = value + } + } + + @set:Deprecated("no more setter", level = DeprecationLevel.HIDDEN) + var pOld_accessors_deprecatedOnSetter: String? = null + get() = field ?: "null?" + set(value) { + if (field == null) { + field = value + } + } + + var pNew_accessors: String? = null + get() = field ?: "null?" + set(value) { + if (field == null) { + field = value + } + } +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.lib.java new file mode 100644 index 00000000000..c4b291cd3bc --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.lib.java @@ -0,0 +1,25 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_accessors; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_accessors();// getPNew_accessors() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_accessors_deprecatedOnSetter();// getPOld_accessors_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_accessors(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_accessors(java.lang.String) + + public final void setPOld_accessors_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_accessors_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.descriptors.java new file mode 100644 index 00000000000..2c9c0dc82c7 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.descriptors.java @@ -0,0 +1,20 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_getter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_getter();// getPNew_getter() + + public Test();// .ctor() + + public final void setPNew_getter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_getter(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java new file mode 100644 index 00000000000..55903132bb1 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java @@ -0,0 +1,22 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_getter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnGetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnSetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_getter();// getPNew_getter() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_getter_deprecatedOnSetter();// getPOld_getter_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_getter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_getter(java.lang.String) + + public final void setPOld_getter_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_getter_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt new file mode 100644 index 00000000000..0eec490075c --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.kt @@ -0,0 +1,18 @@ +package test.pkg + +class Test { + @Deprecated("no more property", level = DeprecationLevel.HIDDEN) + var pOld_getter_deprecatedOnProperty: String? = null + get() = field ?: "null?" + + @get:Deprecated("no more getter", level = DeprecationLevel.HIDDEN) + var pOld_getter_deprecatedOnGetter: String? = null + get() = field ?: "null?" + + @set:Deprecated("no more setter", level = DeprecationLevel.HIDDEN) + var pOld_getter_deprecatedOnSetter: String? = null + get() = field ?: "null?" + + var pNew_getter: String? = null + get() = field ?: "null?" +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.lib.java new file mode 100644 index 00000000000..96331fae65e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.lib.java @@ -0,0 +1,25 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_getter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_getter();// getPNew_getter() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_getter_deprecatedOnSetter();// getPOld_getter_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_getter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_getter(java.lang.String) + + public final void setPOld_getter_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_getter_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.descriptors.java new file mode 100644 index 00000000000..e21e6c9b681 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.descriptors.java @@ -0,0 +1,5 @@ +public abstract interface TestInterface /* test.pkg.TestInterface*/ { + public abstract int getPNew();// getPNew() + + public abstract void setPNew(int);// setPNew(int) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.java new file mode 100644 index 00000000000..b7f7f7d4572 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.java @@ -0,0 +1,9 @@ +public abstract interface TestInterface /* test.pkg.TestInterface*/ { + public abstract int getPNew();// getPNew() + + public abstract int getPOld_deprecatedOnSetter();// getPOld_deprecatedOnSetter() + + public abstract void setPNew(int);// setPNew(int) + + public abstract void setPOld_deprecatedOnGetter(int);// setPOld_deprecatedOnGetter(int) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt new file mode 100644 index 00000000000..1d1c0d480fc --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.kt @@ -0,0 +1,14 @@ +package test.pkg + +interface TestInterface { + @Deprecated("no more property", level = DeprecationLevel.HIDDEN) + var pOld_deprecatedOnProperty: Int + + @get:Deprecated("no more getter", level = DeprecationLevel.HIDDEN) + var pOld_deprecatedOnGetter: Int + + @set:Deprecated("no more setter", level = DeprecationLevel.HIDDEN) + var pOld_deprecatedOnSetter: Int + + var pNew: Int +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.lib.java new file mode 100644 index 00000000000..e05cba99863 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_interface.lib.java @@ -0,0 +1,11 @@ +public abstract interface TestInterface /* test.pkg.TestInterface*/ { + public abstract int getPNew();// getPNew() + + public abstract int getPOld_deprecatedOnSetter();// getPOld_deprecatedOnSetter() + + public abstract void setPNew(int);// setPNew(int) + + public abstract void setPOld_deprecatedOnGetter(int);// setPOld_deprecatedOnGetter(int) + + class DefaultImpls ... +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.descriptors.java new file mode 100644 index 00000000000..d95608dd8d3 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.descriptors.java @@ -0,0 +1,20 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String pNew_noAccessor; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnGetter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnProperty; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnSetter; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getPNew_noAccessor();// getPNew_noAccessor() + + public Test();// .ctor() + + public final void setPNew_noAccessor(@org.jetbrains.annotations.NotNull() java.lang.String);// setPNew_noAccessor(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java new file mode 100644 index 00000000000..dcf83bbd173 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java @@ -0,0 +1,22 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String pNew_noAccessor = "42" /* initializer type: java.lang.String */; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnGetter = "42" /* initializer type: java.lang.String */; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnSetter = "42" /* initializer type: java.lang.String */; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getPNew_noAccessor();// getPNew_noAccessor() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getPOld_noAccessor_deprecatedOnSetter();// getPOld_noAccessor_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_noAccessor(@org.jetbrains.annotations.NotNull() java.lang.String);// setPNew_noAccessor(java.lang.String) + + public final void setPOld_noAccessor_deprecatedOnGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// setPOld_noAccessor_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt new file mode 100644 index 00000000000..157279f88a0 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.kt @@ -0,0 +1,14 @@ +package test.pkg + +class Test { + @Deprecated("no more property", level = DeprecationLevel.HIDDEN) + var pOld_noAccessor_deprecatedOnProperty: String = "42" + + @get:Deprecated("no more getter", level = DeprecationLevel.HIDDEN) + var pOld_noAccessor_deprecatedOnGetter: String = "42" + + @set:Deprecated("no more setter", level = DeprecationLevel.HIDDEN) + var pOld_noAccessor_deprecatedOnSetter: String = "42" + + var pNew_noAccessor: String = "42" +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.lib.java new file mode 100644 index 00000000000..a506f70ff40 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.lib.java @@ -0,0 +1,25 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String pNew_noAccessor; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnGetter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnProperty; + + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnSetter; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getPNew_noAccessor();// getPNew_noAccessor() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getPOld_noAccessor_deprecatedOnSetter();// getPOld_noAccessor_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_noAccessor(@org.jetbrains.annotations.NotNull() java.lang.String);// setPNew_noAccessor(java.lang.String) + + public final void setPOld_noAccessor_deprecatedOnGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// setPOld_noAccessor_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.descriptors.java new file mode 100644 index 00000000000..916818b0944 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.descriptors.java @@ -0,0 +1,20 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_setter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_setter();// getPNew_setter() + + public Test();// .ctor() + + public final void setPNew_setter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_setter(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java new file mode 100644 index 00000000000..350c9dd1c60 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java @@ -0,0 +1,22 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_setter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnGetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnSetter = null /* initializer type: null */; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_setter();// getPNew_setter() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_setter_deprecatedOnSetter();// getPOld_setter_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_setter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_setter(java.lang.String) + + public final void setPOld_setter_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_setter_deprecatedOnGetter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt new file mode 100644 index 00000000000..6fe3dec4d0e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.kt @@ -0,0 +1,34 @@ +package test.pkg + +class Test { + @Deprecated("no more property", level = DeprecationLevel.HIDDEN) + var pOld_setter_deprecatedOnProperty: String? = null + set(value) { + if (field == null) { + field = value + } + } + + @get:Deprecated("no more getter", level = DeprecationLevel.HIDDEN) + var pOld_setter_deprecatedOnGetter: String? = null + set(value) { + if (field == null) { + field = value + } + } + + @set:Deprecated("no more setter", level = DeprecationLevel.HIDDEN) + var pOld_setter_deprecatedOnSetter: String? = null + set(value) { + if (field == null) { + field = value + } + } + + var pNew_setter: String? = null + set(value) { + if (field == null) { + field = value + } + } +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.lib.java new file mode 100644 index 00000000000..1d54a124496 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.lib.java @@ -0,0 +1,25 @@ +public final class Test /* test.pkg.Test*/ { + @org.jetbrains.annotations.Nullable() + private java.lang.String pNew_setter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnGetter; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnProperty; + + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnSetter; + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPNew_setter();// getPNew_setter() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getPOld_setter_deprecatedOnSetter();// getPOld_setter_deprecatedOnSetter() + + public Test();// .ctor() + + public final void setPNew_setter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPNew_setter(java.lang.String) + + public final void setPOld_setter_deprecatedOnGetter(@org.jetbrains.annotations.Nullable() java.lang.String);// setPOld_setter_deprecatedOnGetter(java.lang.String) +}