diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
index 9bc2864f48e..2cd5c26ab19 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
@@ -134,7 +134,7 @@ public object DebugSymbolRenderer {
             }
         }
 
-        if (symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol) {
+        if (symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol || symbol is KtPropertySymbol) {
             renderSymbol(symbol)
             return
         }
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt
new file mode 100644
index 00000000000..0c177b28a1f
--- /dev/null
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt
@@ -0,0 +1,339 @@
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Anno.param1
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: param1
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/String
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: param1
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/String
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Anno.param2
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: param2
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: param2
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtConstructorSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  containingClassIdIfNonLocal: Anno
+  contextReceivers: []
+  hasStableParameterNames: true
+  isExtension: false
+  isPrimary: true
+  origin: SOURCE
+  receiverType: null
+  returnType: Anno
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Anno.param1
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/String
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: param1
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/String
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: param1
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: LOCAL
+      typeParameters: []
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Anno.param2
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: param2
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: param2
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: LOCAL
+      typeParameters: []
+  ]
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: Anno
+  classKind: ANNOTATION_CLASS
+  companionObject: null
+  contextReceivers: []
+  isData: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  modality: FINAL
+  name: Anno
+  origin: SOURCE
+  superTypes: [
+    kotlin/Annotation
+  ]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: [
+    Anno(param1 = "funparam", param2 = 3)
+      psi: KtAnnotationEntry
+  ]
+  callableIdIfNonLocal: /X.x
+  contextReceivers: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: x
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Unit
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): X
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtNamedClassOrObjectSymbol:
+  annotationsList: [
+    Anno(param1 = "param", param2 = 2)
+      psi: KtAnnotationEntry
+  ]
+  classIdIfNonLocal: X
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isData: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  modality: FINAL
+  name: X
+  origin: SOURCE
+  superTypes: [
+    kotlin/Any
+  ]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
index 87fd7620e89..f5dcffcaa98 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param1)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Anno.param1
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val param1: String)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: param1
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/String
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -22,7 +64,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param2)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Anno.param2
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val param2: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: param2
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -56,7 +140,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param1)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Anno.param1
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/String
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val param1: String)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: param1
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/String
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -73,7 +199,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param2)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Anno.param2
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val param2: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: param2
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt
new file mode 100644
index 00000000000..080f3e563c6
--- /dev/null
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt
@@ -0,0 +1,199 @@
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /A.a
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: a
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: a
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: null
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: b
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/String
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtConstructorSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  containingClassIdIfNonLocal: A
+  contextReceivers: []
+  hasStableParameterNames: true
+  isExtension: false
+  isPrimary: true
+  origin: SOURCE
+  receiverType: null
+  returnType: A
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /A.a
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: a
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: a
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: LOCAL
+      typeParameters: []
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: b
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: LOCAL
+      typeParameters: []
+  ]
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: A
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isData: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  modality: FINAL
+  name: A
+  origin: SOURCE
+  superTypes: [
+    kotlin/Any
+  ]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
index 4a5d2eeaa11..b64d9db355b 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/A.a)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /A.a
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val a: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: a
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -56,7 +98,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/A.a)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /A.a
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val a: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: a
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
index a444c6afc1e..aca4ff57964 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.x
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: x
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -22,7 +64,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.y
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: y
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -42,7 +126,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.z
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: z
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -76,7 +202,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.x
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: x
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -93,7 +261,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.y
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: y
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -110,7 +320,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.z
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: z
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
index 79065d2a25d..8e5c9235e37 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.x
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val x: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: x
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -22,7 +64,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.y
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val y: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: y
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -42,7 +126,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /MyColor.z
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val z: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: z
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -76,7 +202,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.x
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val x: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: x
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -93,7 +261,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.y
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val y: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: y
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -110,7 +320,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /MyColor.z
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val z: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: z
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt
new file mode 100644
index 00000000000..40f516e223c
--- /dev/null
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt
@@ -0,0 +1,339 @@
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /P.x
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: x
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: x
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtValueParameterSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /P.y
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: y
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
+  hasDefaultValue: false
+  isCrossinline: false
+  isExtension: false
+  isImplicitLambdaParameter: false
+  isNoinline: false
+  isVararg: false
+  name: y
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtConstructorSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  containingClassIdIfNonLocal: P
+  contextReceivers: []
+  hasStableParameterNames: true
+  isExtension: false
+  isPrimary: true
+  origin: SOURCE
+  receiverType: null
+  returnType: P
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /P.x
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: x
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: x
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: LOCAL
+      typeParameters: []
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /P.y
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: y
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: y
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: LOCAL
+      typeParameters: []
+  ]
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: P
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isData: true
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  modality: FINAL
+  name: P
+  origin: SOURCE
+  superTypes: [
+    kotlin/Any
+  ]
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtLocalVariableSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  isExtension: false
+  isVal: true
+  name: l
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtLocalVariableSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  isExtension: false
+  isVal: true
+  name: r
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: /destruct
+  contextReceivers: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: destruct
+  origin: SOURCE
+  receiverType: null
+  returnType: kotlin/Int
+  symbolKind: TOP_LEVEL
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
index 4ed79e4df93..6a6bd791335 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.x)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /P.x
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val x: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: x
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -22,7 +64,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.y)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /P.y
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val y: Int)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: y
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -56,7 +140,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.x)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /P.x
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val x: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: x
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -73,7 +199,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.y)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /P.y
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val y: Int)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: y
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
index 6edc5c320cb..65a9df27ca7 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Style.value
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: false
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: null
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: value
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/String
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -36,7 +78,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Style.value
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: false
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/String
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: null
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: false
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: value
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/String
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
index 4a5ef04adde..a5c484ecec9 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
@@ -2,7 +2,49 @@ KtValueParameterSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
   contextReceivers: []
-  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
+  generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /Style.value
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: false
+      hasStableParameterNames: true
+      isDefault: true
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/String
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: false
+    initializer: KtNonConstantInitializerValue(val value: String)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: true
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: true
+    modality: FINAL
+    name: value
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/String
+    setter: null
+    symbolKind: CLASS_MEMBER
+    typeParameters: []
+    visibility: Public
   hasDefaultValue: false
   isCrossinline: false
   isExtension: false
@@ -36,7 +78,49 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
+        annotationsList: []
+        callableIdIfNonLocal: /Style.value
+        contextReceivers: []
+        getter: KtPropertyGetterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          hasBody: false
+          hasStableParameterNames: true
+          isDefault: true
+          isExtension: false
+          isInline: false
+          isOverride: false
+          modality: FINAL
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/String
+          symbolKind: ACCESSOR
+          typeParameters: []
+          valueParameters: []
+          visibility: Public
+        hasBackingField: true
+        hasGetter: true
+        hasSetter: false
+        initializer: KtNonConstantInitializerValue(val value: String)
+        isConst: false
+        isDelegatedProperty: false
+        isExtension: false
+        isFromPrimaryConstructor: true
+        isLateInit: false
+        isOverride: false
+        isStatic: false
+        isVal: true
+        modality: FINAL
+        name: value
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/String
+        setter: null
+        symbolKind: CLASS_MEMBER
+        typeParameters: []
+        visibility: Public
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
index ff7ca838e81..22dc5cb01aa 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
@@ -5,7 +5,101 @@ KtBackingFieldSymbol:
   isExtension: false
   name: field
   origin: PROPERTY_BACKING_FIELD
-  owningProperty: KtKotlinPropertySymbol(/x)
+  owningProperty: KtKotlinPropertySymbol:
+    annotationsList: []
+    callableIdIfNonLocal: /x
+    contextReceivers: []
+    getter: KtPropertyGetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: true
+      hasStableParameterNames: true
+      isDefault: false
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      receiverType: null
+      returnType: kotlin/Int
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: []
+      visibility: Public
+    hasBackingField: true
+    hasGetter: true
+    hasSetter: true
+    initializer: KtConstantInitializerValue(0)
+    isConst: false
+    isDelegatedProperty: false
+    isExtension: false
+    isFromPrimaryConstructor: false
+    isLateInit: false
+    isOverride: false
+    isStatic: false
+    isVal: false
+    modality: FINAL
+    name: x
+    origin: SOURCE
+    receiverType: null
+    returnType: kotlin/Int
+    setter: KtPropertySetterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      hasBody: true
+      hasStableParameterNames: true
+      isDefault: false
+      isExtension: false
+      isInline: false
+      isOverride: false
+      modality: FINAL
+      origin: SOURCE
+      parameter: KtValueParameterSymbol:
+        annotationsList: []
+        callableIdIfNonLocal: null
+        contextReceivers: []
+        generatedPrimaryConstructorProperty: null
+        hasDefaultValue: false
+        isCrossinline: false
+        isExtension: false
+        isImplicitLambdaParameter: false
+        isNoinline: false
+        isVararg: false
+        name: value
+        origin: SOURCE
+        receiverType: null
+        returnType: kotlin/Int
+        symbolKind: LOCAL
+        typeParameters: []
+      receiverType: null
+      returnType: kotlin/Unit
+      symbolKind: ACCESSOR
+      typeParameters: []
+      valueParameters: [
+        KtValueParameterSymbol:
+          annotationsList: []
+          callableIdIfNonLocal: null
+          contextReceivers: []
+          generatedPrimaryConstructorProperty: null
+          hasDefaultValue: false
+          isCrossinline: false
+          isExtension: false
+          isImplicitLambdaParameter: false
+          isNoinline: false
+          isVararg: false
+          name: value
+          origin: SOURCE
+          receiverType: null
+          returnType: kotlin/Int
+          symbolKind: LOCAL
+          typeParameters: []
+      ]
+      visibility: Public
+    symbolKind: TOP_LEVEL
+    typeParameters: []
+    visibility: Public
   receiverType: null
   returnType: kotlin/Int
   symbolKind: LOCAL