KT-56835 [SLC] Mark property$delegate fields as final and @NotNull

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt

@@ -98,12 +98,10 @@ internal class SymbolLightFieldForProperty private constructor(
         in GranularModifiersBox.VISIBILITY_MODIFIERS -> GranularModifiersBox.computeVisibilityForMember(ktModule, propertySymbolPointer)
         in GranularModifiersBox.MODALITY_MODIFIERS -> {
             val modality = withPropertySymbol { propertySymbol ->
-                if (propertySymbol.isVal) {
+                if (propertySymbol.isVal || propertySymbol.isDelegatedProperty) {
                     PsiModifier.FINAL
                 } else {
-                    propertySymbol.computeSimpleModality()?.takeIf {
+                    propertySymbol.computeSimpleModality()?.takeIf { it != PsiModifier.FINAL }
-                        it != PsiModifier.FINAL || isTopLevel && propertySymbol.isDelegatedProperty
-                    }
                 }
             }
 
@@ -154,10 +152,10 @@ internal class SymbolLightFieldForProperty private constructor(
                 ),
                 additionalAnnotationsProvider = NullabilityAnnotationsProvider {
                     withPropertySymbol { propertySymbol ->
-                        if (!(propertySymbol is KtKotlinPropertySymbol && propertySymbol.isLateInit)) {
+                        when {
-                            getTypeNullability(propertySymbol.returnType)
+                            propertySymbol.isDelegatedProperty -> NullabilityType.NotNull
-                        } else {
+                            !(propertySymbol is KtKotlinPropertySymbol && propertySymbol.isLateInit) -> getTypeNullability(propertySymbol.returnType)
-                            NullabilityType.Unknown
+                            else -> NullabilityType.Unknown
                         }
                     }
                 }

compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.fir.java

@@ -5,6 +5,9 @@ public static abstract class Base /* Container.Base*/ {
   @org.jetbrains.annotations.NotNull()
   private final Container.Delegate<java.lang.String> b$delegate;
 
+  @org.jetbrains.annotations.NotNull()
+  private final Container.Delegate<java.lang.String> mutable$delegate;
+
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String c = "" /* initializer type: java.lang.String */;
 
@@ -20,7 +23,12 @@ public static abstract class Base /* Container.Base*/ {
   @org.jetbrains.annotations.NotNull()
   public java.lang.String getC();//  getC()
 
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getMutable();//  getMutable()
+
   public  Base();//  .ctor()
+
+  public final void setMutable(@org.jetbrains.annotations.Nullable() java.lang.String);//  setMutable(java.lang.String)
 }
 
 public static final class Companion /* Container.Companion*/ {

compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.java

@@ -5,6 +5,9 @@ public static abstract class Base /* Container.Base*/ {
   @org.jetbrains.annotations.NotNull()
   private final Container.Delegate b$delegate;
 
+  @org.jetbrains.annotations.NotNull()
+  private final Container.Delegate mutable$delegate;
+
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String c;
 
@@ -20,7 +23,12 @@ public static abstract class Base /* Container.Base*/ {
   @org.jetbrains.annotations.NotNull()
   public java.lang.String getC();//  getC()
 
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getMutable();//  getMutable()
+
   public  Base();//  .ctor()
+
+  public final void setMutable(@org.jetbrains.annotations.Nullable() java.lang.String);//  setMutable(java.lang.String)
 }
 
 public static final class Companion /* Container.Companion*/ {

compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.kt

@@ -15,6 +15,7 @@ class Container {
 
     abstract class Base {
         val a: String by delegate()
+        var mutable: String? by delegate()
         open val b: String by delegate()
         open val c: String = ""
         abstract val d: String

compiler/testData/asJava/lightClasses/lightClassByPsi/facades/properties.fir.java

@@ -2,6 +2,9 @@ public final class PropertiesKt /* PropertiesKt*/ {
   @org.jetbrains.annotations.NotNull()
   private static final error.NonExistentClass delegatedProp$delegate;
 
+  @org.jetbrains.annotations.NotNull()
+  private static final error.NonExistentClass delegatedProp2$delegate;
+
   @org.jetbrains.annotations.NotNull()
   private static final java.lang.Object arrayConst;
 
@@ -38,8 +41,6 @@ public final class PropertiesKt /* PropertiesKt*/ {
   @org.jetbrains.annotations.Nullable()
   private static java.lang.Integer isEmptyInt;
 
-  private static final error.NonExistentClass delegatedProp2$delegate;
-
   private static final error.NonExistentClass intConst = 30 /* initializer type: int */;
 
   private static final int f1 = 2 /* initializer type: int */;