AA: render containing file and JvmClassName

analysis/analysis-api/testData/symbols/multiModuleSymbolByPsi/expectActual.pretty.txt

@@ -47,4 +47,3 @@ class D
 fun baz()
 
 var m: kotlin.Int
-

analysis/analysis-api/testData/symbols/multiModuleSymbolByPsi/expectActual.txt

@@ -954,4 +954,3 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
-

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedParameterType.descriptors.txt

@@ -46,9 +46,13 @@ KtFunctionSymbol:
         type: SecondAlias
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(ExpandedParameterType.kt)
+      getContainingJvmClassName: ExpandedParameterTypeKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(ExpandedParameterType.kt)
+  getContainingJvmClassName: ExpandedParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedParameterType.pretty.txt

@@ -1 +1 @@
-fun foo(param: Base)
+fun foo(param: Base)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedParameterType.txt

@@ -46,9 +46,13 @@ KtFunctionSymbol:
         type: Base
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(ExpandedParameterType.kt)
+      getContainingJvmClassName: ExpandedParameterTypeKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(ExpandedParameterType.kt)
+  getContainingJvmClassName: ExpandedParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedReturnType.descriptors.txt

@@ -27,5 +27,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(ExpandedReturnType.kt)
+  getContainingJvmClassName: ExpandedReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedReturnType.pretty.txt

@@ -1 +1 @@
-fun foo(): Base
+fun foo(): Base

analysis/analysis-api/testData/symbols/singleSymbolByPsi/ExpandedReturnType.txt

@@ -27,5 +27,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(ExpandedReturnType.kt)
+  getContainingJvmClassName: ExpandedReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/booleanConstReferenceInImplies.pretty.txt

@@ -1,2 +1,2 @@
 @kotlin.OptIn(markerClass = [kotlin.contracts.ExperimentalContracts::class])
-fun booleanConstReferenceInImplies(): kotlin.Boolean
+fun booleanConstReferenceInImplies(): kotlin.Boolean

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/booleanConstReferenceInImplies.txt

@@ -40,5 +40,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(booleanConstReferenceInImplies.kt)
+  getContainingJvmClassName: BooleanConstReferenceInImpliesKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/booleanExprContract.txt

@@ -39,6 +39,8 @@ KtFunctionSymbol:
                         type: kotlin/Any?
                       symbolKind: LOCAL
                       typeParameters: []
+                      getContainingFileSymbol: KtFileSymbol(booleanExprContract.kt)
+                      getContainingJvmClassName: BooleanExprContractKt
                       getContainingModule: KtSourceModule "Sources of main"
                       deprecationStatus: null
               isNegated: false
@@ -67,6 +69,8 @@ KtFunctionSymbol:
                         type: kotlin/Any?
                       symbolKind: LOCAL
                       typeParameters: []
+                      getContainingFileSymbol: KtFileSymbol(booleanExprContract.kt)
+                      getContainingJvmClassName: BooleanExprContractKt
                       getContainingModule: KtSourceModule "Sources of main"
                       deprecationStatus: null
               isNegated: true
@@ -115,6 +119,8 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(booleanExprContract.kt)
+      getContainingJvmClassName: BooleanExprContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     KtValueParameterSymbol:
@@ -137,9 +143,13 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(booleanExprContract.kt)
+      getContainingJvmClassName: BooleanExprContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(booleanExprContract.kt)
+  getContainingJvmClassName: BooleanExprContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceAtLeastOnceContract.txt

@@ -35,6 +35,8 @@ KtFunctionSymbol:
                 type: kotlin/Function0<kotlin/Unit>
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(callsInPlaceAtLeastOnceContract.kt)
+              getContainingJvmClassName: CallsInPlaceAtLeastOnceContractKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: AT_LEAST_ONCE
@@ -87,9 +89,13 @@ KtFunctionSymbol:
         type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(callsInPlaceAtLeastOnceContract.kt)
+      getContainingJvmClassName: CallsInPlaceAtLeastOnceContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(callsInPlaceAtLeastOnceContract.kt)
+  getContainingJvmClassName: CallsInPlaceAtLeastOnceContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceAtMostOnceContract.txt

@@ -35,6 +35,8 @@ KtFunctionSymbol:
                 type: kotlin/Function0<kotlin/Unit>
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(callsInPlaceAtMostOnceContract.kt)
+              getContainingJvmClassName: CallsInPlaceAtMostOnceContractKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: AT_MOST_ONCE
@@ -87,9 +89,13 @@ KtFunctionSymbol:
         type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(callsInPlaceAtMostOnceContract.kt)
+      getContainingJvmClassName: CallsInPlaceAtMostOnceContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(callsInPlaceAtMostOnceContract.kt)
+  getContainingJvmClassName: CallsInPlaceAtMostOnceContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceExactlyOnceContract.txt

@@ -35,6 +35,8 @@ KtFunctionSymbol:
                 type: kotlin/Function0<kotlin/Unit>
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(callsInPlaceExactlyOnceContract.kt)
+              getContainingJvmClassName: CallsInPlaceExactlyOnceContractKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: EXACTLY_ONCE
@@ -87,9 +89,13 @@ KtFunctionSymbol:
         type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(callsInPlaceExactlyOnceContract.kt)
+      getContainingJvmClassName: CallsInPlaceExactlyOnceContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(callsInPlaceExactlyOnceContract.kt)
+  getContainingJvmClassName: CallsInPlaceExactlyOnceContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/callsInPlaceUnknownContract.txt

@@ -35,6 +35,8 @@ KtFunctionSymbol:
                 type: kotlin/Function0<kotlin/Unit>
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(callsInPlaceUnknownContract.kt)
+              getContainingJvmClassName: CallsInPlaceUnknownContractKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: UNKNOWN
@@ -87,9 +89,13 @@ KtFunctionSymbol:
         type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(callsInPlaceUnknownContract.kt)
+      getContainingJvmClassName: CallsInPlaceUnknownContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(callsInPlaceUnknownContract.kt)
+  getContainingJvmClassName: CallsInPlaceUnknownContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/invalidContractParameterPassedToReturns.txt

@@ -49,6 +49,8 @@ KtFunctionSymbol:
         type: kotlin/Any
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(invalidContractParameterPassedToReturns.kt)
+      getContainingJvmClassName: InvalidContractParameterPassedToReturnsKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     KtValueParameterSymbol:
@@ -71,9 +73,13 @@ KtFunctionSymbol:
         type: kotlin/Boolean
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(invalidContractParameterPassedToReturns.kt)
+      getContainingJvmClassName: InvalidContractParameterPassedToReturnsKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(invalidContractParameterPassedToReturns.kt)
+  getContainingJvmClassName: InvalidContractParameterPassedToReturnsKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/isInstancePredicateContract.pretty.txt

@@ -1,2 +1,2 @@
 @kotlin.OptIn(markerClass = [kotlin.contracts.ExperimentalContracts::class])
-fun isInstancePredicateContract(value: kotlin.Any)
+fun isInstancePredicateContract(value: kotlin.Any)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/isInstancePredicateContract.txt

@@ -34,6 +34,8 @@ KtFunctionSymbol:
                     type: kotlin/Any
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(isInstancePredicateContract.kt)
+                  getContainingJvmClassName: IsInstancePredicateContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           type:
@@ -86,9 +88,13 @@ KtFunctionSymbol:
         type: kotlin/Any
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(isInstancePredicateContract.kt)
+      getContainingJvmClassName: IsInstancePredicateContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(isInstancePredicateContract.kt)
+  getContainingJvmClassName: IsInstancePredicateContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/logicalNotContract.txt

@@ -34,6 +34,8 @@ KtFunctionSymbol:
                     type: kotlin/Boolean
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(logicalNotContract.kt)
+                  getContainingJvmClassName: LogicalNotContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
   ]
@@ -80,9 +82,13 @@ KtFunctionSymbol:
         type: kotlin/Boolean
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(logicalNotContract.kt)
+      getContainingJvmClassName: LogicalNotContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(logicalNotContract.kt)
+  getContainingJvmClassName: LogicalNotContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/referenceBooleanReceiverInContract.txt

@@ -20,6 +20,7 @@ KtFunctionSymbol:
                 annotationsList: []
                 ownTypeArguments: []
                 type: kotlin/Boolean
+              getContainingFileSymbol: KtFileSymbol(referenceBooleanReceiverInContract.kt)
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
   ]
@@ -46,6 +47,7 @@ KtFunctionSymbol:
       annotationsList: []
       ownTypeArguments: []
       type: kotlin/Boolean
+    getContainingFileSymbol: KtFileSymbol(referenceBooleanReceiverInContract.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -56,5 +58,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(referenceBooleanReceiverInContract.kt)
+  getContainingJvmClassName: ReferenceBooleanReceiverInContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/referenceReceiverInContract.txt

@@ -23,6 +23,7 @@ KtFunctionSymbol:
                     type: kotlin/Unit
                 ]
                 type: kotlin/Function0<kotlin/Unit>
+              getContainingFileSymbol: KtFileSymbol(referenceReceiverInContract.kt)
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: EXACTLY_ONCE
@@ -55,6 +56,7 @@ KtFunctionSymbol:
           type: kotlin/Unit
       ]
       type: kotlin/Function0<kotlin/Unit>
+    getContainingFileSymbol: KtFileSymbol(referenceReceiverInContract.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -65,5 +67,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(referenceReceiverInContract.kt)
+  getContainingJvmClassName: ReferenceReceiverInContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsContract.txt

@@ -32,6 +32,8 @@ KtFunctionSymbol:
                 type: kotlin/Boolean
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(returnsContract.kt)
+              getContainingJvmClassName: ReturnsContractKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
   ]
@@ -78,9 +80,13 @@ KtFunctionSymbol:
         type: kotlin/Boolean
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(returnsContract.kt)
+      getContainingJvmClassName: ReturnsContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(returnsContract.kt)
+  getContainingJvmClassName: ReturnsContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsFalseContract.txt

@@ -37,6 +37,8 @@ KtFunctionSymbol:
                     type: kotlin/Any?
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(returnsFalseContract.kt)
+                  getContainingJvmClassName: ReturnsFalseContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           isNegated: true
@@ -84,9 +86,13 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(returnsFalseContract.kt)
+      getContainingJvmClassName: ReturnsFalseContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(returnsFalseContract.kt)
+  getContainingJvmClassName: ReturnsFalseContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsNotNullContract.txt

@@ -34,6 +34,8 @@ KtFunctionSymbol:
                     type: kotlin/Any?
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(returnsNotNullContract.kt)
+                  getContainingJvmClassName: ReturnsNotNullContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           isNegated: true
@@ -81,9 +83,13 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(returnsNotNullContract.kt)
+      getContainingJvmClassName: ReturnsNotNullContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(returnsNotNullContract.kt)
+  getContainingJvmClassName: ReturnsNotNullContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsNullContract.txt

@@ -37,6 +37,8 @@ KtFunctionSymbol:
                     type: kotlin/Any?
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(returnsNullContract.kt)
+                  getContainingJvmClassName: ReturnsNullContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           isNegated: false
@@ -84,9 +86,13 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(returnsNullContract.kt)
+      getContainingJvmClassName: ReturnsNullContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(returnsNullContract.kt)
+  getContainingJvmClassName: ReturnsNullContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/returnsTrueContract.txt

@@ -37,6 +37,8 @@ KtFunctionSymbol:
                     type: kotlin/Any?
                   symbolKind: LOCAL
                   typeParameters: []
+                  getContainingFileSymbol: KtFileSymbol(returnsTrueContract.kt)
+                  getContainingJvmClassName: ReturnsTrueContractKt
                   getContainingModule: KtSourceModule "Sources of main"
                   deprecationStatus: null
           isNegated: false
@@ -84,9 +86,13 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(returnsTrueContract.kt)
+      getContainingJvmClassName: ReturnsTrueContractKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(returnsTrueContract.kt)
+  getContainingJvmClassName: ReturnsTrueContractKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts/twoContracts.txt

@@ -39,6 +39,8 @@ KtFunctionSymbol:
                         type: kotlin/Any?
                       symbolKind: LOCAL
                       typeParameters: []
+                      getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+                      getContainingJvmClassName: TwoContractsKt
                       getContainingModule: KtSourceModule "Sources of main"
                       deprecationStatus: null
               isNegated: false
@@ -67,6 +69,8 @@ KtFunctionSymbol:
                         type: kotlin/Any?
                       symbolKind: LOCAL
                       typeParameters: []
+                      getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+                      getContainingJvmClassName: TwoContractsKt
                       getContainingModule: KtSourceModule "Sources of main"
                       deprecationStatus: null
               isNegated: true
@@ -100,6 +104,8 @@ KtFunctionSymbol:
                 type: kotlin/Function0<kotlin/Unit>
               symbolKind: LOCAL
               typeParameters: []
+              getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+              getContainingJvmClassName: TwoContractsKt
               getContainingModule: KtSourceModule "Sources of main"
               deprecationStatus: null
       occurrencesRange: EXACTLY_ONCE
@@ -147,6 +153,8 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+      getContainingJvmClassName: TwoContractsKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     KtValueParameterSymbol:
@@ -169,6 +177,8 @@ KtFunctionSymbol:
         type: kotlin/Any?
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+      getContainingJvmClassName: TwoContractsKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     KtValueParameterSymbol:
@@ -196,9 +206,13 @@ KtFunctionSymbol:
         type: kotlin/Function0<kotlin/Unit>
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+      getContainingJvmClassName: TwoContractsKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(twoContracts.kt)
+  getContainingJvmClassName: TwoContractsKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/destructuringDeclaration.pretty.txt

@@ -1,2 +1,2 @@
 @AAA(value = "y")
-(@BBB(value = "aaa") a: kotlin.Int, @BBB(value = "bbb") b: kotlin.Int)
+(@BBB(value = "aaa") a: kotlin.Int, @BBB(value = "bbb") b: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/destructuringDeclaration.txt

@@ -10,5 +10,6 @@ KtDestructuringDeclarationSymbol:
   origin: SOURCE
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(destructuringDeclaration.kt)
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/destructuringDeclarationInLambda.pretty.txt

@@ -1 +1 @@
-(a: kotlin.Int, b: kotlin.Int)
+(a: kotlin.Int, b: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/destructuringDeclarationInLambda.txt

@@ -7,5 +7,6 @@ KtDestructuringDeclarationSymbol:
   origin: SOURCE
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(destructuringDeclarationInLambda.kt)
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/destructuringDeclarationParameterInLambda.txt

@@ -18,5 +18,7 @@ KtValueParameterSymbol:
     type: X
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(destructuringDeclarationParameterInLambda.kt)
+  getContainingJvmClassName: null
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryInDestructuringDeclaration.txt

@@ -13,5 +13,7 @@ KtLocalVariableSymbol:
     type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(entryInDestructuringDeclaration.kt)
+  getContainingJvmClassName: null
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryInDestructuringDeclarationParameterInLambda.txt

@@ -13,5 +13,7 @@ KtLocalVariableSymbol:
     type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(entryInDestructuringDeclarationParameterInLambda.kt)
+  getContainingJvmClassName: null
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryUnderscoreInDestructuringDeclaration.pretty.txt

@@ -1 +1 @@
-val `<unused var>`: kotlin.Int
+val `<unused var>`: kotlin.Int

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryUnderscoreInDestructuringDeclaration.txt

@@ -13,5 +13,7 @@ KtLocalVariableSymbol:
     type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(entryUnderscoreInDestructuringDeclaration.kt)
+  getContainingJvmClassName: null
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.pretty.txt

@@ -1 +1 @@
-val `<unused var>`: kotlin.Int
+val `<unused var>`: kotlin.Int

analysis/analysis-api/testData/symbols/singleSymbolByPsi/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.txt

@@ -13,5 +13,7 @@ KtLocalVariableSymbol:
     type: kotlin/Int
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(entryUnderscoreInDestructuringDeclarationParameterInLambda.kt)
+  getContainingJvmClassName: null
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonymousObjectInInvalidPosition.txt

@@ -19,6 +19,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(anonymousObjectInInvalidPosition.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.txt

@@ -14,6 +14,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(objectWithTypeArgsAsExpression.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.pretty.txt

@@ -1 +1 @@
-fun @receiver:ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Int.foo()
+fun @receiver:ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Int.foo()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt

@@ -32,6 +32,7 @@ KtFunctionSymbol:
       ]
       ownTypeArguments: []
       type: @R|ReceiverTypeAnnotation|()  kotlin/Int
+    getContainingFileSymbol: KtFileSymbol(functionWithReceiverAnnotation.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -42,5 +43,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(functionWithReceiverAnnotation.kt)
+  getContainingJvmClassName: FunctionWithReceiverAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.pretty.txt

@@ -1,3 +1,3 @@
 @GetAnnotation
 @ExplicitGetAnnotation
-get()
+get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.txt

@@ -24,5 +24,7 @@ KtPropertyGetterSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(getterWithAnnotations.kt)
+  getContainingJvmClassName: GetterWithAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.pretty.txt

@@ -1,3 +1,3 @@
 @GetAnnotation
 @ExplicitGetAnnotation
-get()
+get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.txt

@@ -29,6 +29,7 @@ KtPropertyGetterSymbol:
       ]
       ownTypeArguments: []
       type: @R|ReceiverTypeAnnotation|()  kotlin/Long
+    getContainingFileSymbol: KtFileSymbol(getterWithReceiverAndAnnotations.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -39,5 +40,7 @@ KtPropertyGetterSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(getterWithReceiverAndAnnotations.kt)
+  getContainingJvmClassName: GetterWithReceiverAndAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/nestedTypeAnnotationWithTypeAlias.descriptors.txt

@@ -44,5 +44,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAlias.kt)
+  getContainingJvmClassName: NestedTypeAnnotationWithTypeAliasKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/nestedTypeAnnotationWithTypeAlias.pretty.txt

@@ -1 +1 @@
-fun foo2(): kotlin.collections.List<kotlin.collections.List<@Anno1(s = "s") @Anno2 @Anno3 BaseAnnotation>>?
+fun foo2(): kotlin.collections.List<kotlin.collections.List<@Anno1(s = "s") @Anno2 @Anno3 BaseAnnotation>>?

analysis/analysis-api/testData/symbols/singleSymbolByPsi/nestedTypeAnnotationWithTypeAlias.txt

@@ -44,5 +44,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAlias.kt)
+  getContainingJvmClassName: NestedTypeAnnotationWithTypeAliasKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/nestedTypeAnnotationWithTypeAliasAsAnnotation.descriptors.txt

@@ -25,6 +25,7 @@ KtFunctionSymbol:
     type: KtTypeParameterType:
       annotationsList: []
       type: T
+    getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAliasAsAnnotation.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -49,5 +50,7 @@ KtFunctionSymbol:
   ]
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAliasAsAnnotation.kt)
+  getContainingJvmClassName: NestedTypeAnnotationWithTypeAliasAsAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/nestedTypeAnnotationWithTypeAliasAsAnnotation.txt

@@ -25,6 +25,7 @@ KtFunctionSymbol:
     type: KtTypeParameterType:
       annotationsList: []
       type: T
+    getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAliasAsAnnotation.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -49,5 +50,7 @@ KtFunctionSymbol:
   ]
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(nestedTypeAnnotationWithTypeAliasAsAnnotation.kt)
+  getContainingJvmClassName: NestedTypeAnnotationWithTypeAliasAsAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt

@@ -1,162 +0,0 @@
-KtKotlinPropertySymbol:
-  annotationsList: [
-    PropertyAnnotation()
-      psi: KtAnnotationEntry
-  ]
-  backingFieldSymbol: KtBackingFieldSymbol:
-    annotationsList: [
-      FieldAnnotation()
-        psi: KtAnnotationEntry
-    ]
-    callableIdIfNonLocal: null
-    contextReceivers: []
-    isExtension: false
-    name: field
-    origin: PROPERTY_BACKING_FIELD
-    owningProperty: KtKotlinPropertySymbol(/prop)
-    receiverParameter: null
-    returnType: KtUsualClassType:
-      annotationsList: []
-      ownTypeArguments: []
-      type: kotlin/Int
-    symbolKind: LOCAL
-    typeParameters: []
-    getContainingModule: KtSourceModule "Sources of main"
-    deprecationStatus: null
-  callableIdIfNonLocal: /prop
-  contextReceivers: []
-  getter: KtPropertyGetterSymbol:
-    annotationsList: [
-      GetAnnotation()
-        psi: KtAnnotationEntry
-    ]
-    callableIdIfNonLocal: null
-    contextReceivers: []
-    hasBody: false
-    hasStableParameterNames: true
-    isDefault: true
-    isExtension: false
-    isInline: false
-    isOverride: false
-    modality: FINAL
-    origin: SOURCE
-    receiverParameter: null
-    returnType: KtUsualClassType:
-      annotationsList: []
-      ownTypeArguments: []
-      type: kotlin/Int
-    symbolKind: ACCESSOR
-    typeParameters: []
-    valueParameters: []
-    visibility: Public
-    getContainingModule: KtSourceModule "Sources of main"
-    deprecationStatus: null
-  hasBackingField: true
-  hasGetter: true
-  hasSetter: true
-  initializer: KtConstantInitializerValue(1)
-  isActual: false
-  isConst: false
-  isDelegatedProperty: false
-  isExpect: false
-  isExtension: false
-  isFromPrimaryConstructor: false
-  isLateInit: false
-  isOverride: false
-  isStatic: false
-  isVal: false
-  modality: FINAL
-  name: prop
-  origin: SOURCE
-  receiverParameter: null
-  returnType: KtUsualClassType:
-    annotationsList: []
-    ownTypeArguments: []
-    type: kotlin/Int
-  setter: KtPropertySetterSymbol:
-    annotationsList: [
-      SetAnnotation()
-        psi: KtAnnotationEntry
-    ]
-    callableIdIfNonLocal: null
-    contextReceivers: []
-    hasBody: false
-    hasStableParameterNames: true
-    isDefault: true
-    isExtension: false
-    isInline: false
-    isOverride: false
-    modality: FINAL
-    origin: SOURCE
-    parameter: KtValueParameterSymbol:
-      annotationsList: [
-        SetparamAnnotation()
-          psi: KtAnnotationEntry
-      ]
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: null
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: value
-      origin: SOURCE
-      receiverParameter: null
-      returnType: KtUsualClassType:
-        annotationsList: []
-        ownTypeArguments: []
-        type: kotlin/Int
-      symbolKind: LOCAL
-      typeParameters: []
-      getContainingModule: KtSourceModule "Sources of main"
-      deprecationStatus: null
-    receiverParameter: null
-    returnType: KtUsualClassType:
-      annotationsList: []
-      ownTypeArguments: []
-      type: kotlin/Unit
-    symbolKind: ACCESSOR
-    typeParameters: []
-    valueParameters: [
-      KtValueParameterSymbol:
-        annotationsList: [
-          SetparamAnnotation()
-            psi: KtAnnotationEntry
-        ]
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: value
-        origin: SOURCE
-        receiverParameter: null
-        returnType: KtUsualClassType:
-          annotationsList: []
-          ownTypeArguments: []
-          type: kotlin/Int
-        symbolKind: LOCAL
-        typeParameters: []
-        getContainingModule: KtSourceModule "Sources of main"
-        deprecationStatus: null
-    ]
-    visibility: Public
-    getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.KtFe10PsiDefaultPropertySetterSymbol
-
-    deprecationStatus: null
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-  getterDeprecationStatus: null
-  javaGetterName: getProp
-  javaSetterName: setProp
-  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt

@@ -3,4 +3,4 @@ var prop: kotlin.Int
   @GetAnnotation
   get()
   @SetAnnotation
-  set(@SetparamAnnotation value: kotlin.Int)
+  set(@SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt

@@ -21,6 +21,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /prop
@@ -49,6 +51,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -111,6 +115,8 @@ KtKotlinPropertySymbol:
         type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
@@ -144,18 +150,24 @@ KtKotlinPropertySymbol:
           type: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []
+        getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+        getContainingJvmClassName: null
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
     ]
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(propertyWithAnnotations.kt)
+  getContainingJvmClassName: PropertyWithAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getProp
   javaSetterName: setProp
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt

@@ -5,4 +5,4 @@ var x: kotlin.Int
   get()
   @SetAnnotation
   @ExplicitSetAnnotation
-  set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
+  set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt

@@ -21,6 +21,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsAndAccessorsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /x
@@ -51,6 +53,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsAndAccessorsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -117,6 +121,8 @@ KtKotlinPropertySymbol:
         type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     receiverParameter: null
@@ -152,18 +158,24 @@ KtKotlinPropertySymbol:
           type: kotlin/Int
         symbolKind: LOCAL
         typeParameters: []
+        getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+        getContainingJvmClassName: null
         getContainingModule: KtSourceModule "Sources of main"
         deprecationStatus: null
     ]
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+    getContainingJvmClassName: PropertyWithAnnotationsAndAccessorsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(propertyWithAnnotationsAndAccessors.kt)
+  getContainingJvmClassName: PropertyWithAnnotationsAndAccessorsKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getX
   javaSetterName: setX
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt

@@ -20,6 +20,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+    getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /lazyProperty
@@ -45,6 +47,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+    getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -73,6 +77,8 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+  getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt

@@ -1,4 +1,4 @@
 @ExplicitPropertyAnnotation
 @PropertyAnnotation
 val lazyProperty: kotlin.Int
-  get()
+  get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt

@@ -23,6 +23,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+    getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /lazyProperty
@@ -48,6 +50,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+    getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -76,9 +80,11 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(propertyWithDelegateAndAnnotations.kt)
+  getContainingJvmClassName: PropertyWithDelegateAndAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getLazyProperty
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt

@@ -1,2 +1,2 @@
 val @receiver:ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean
-  get()
+  get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt

@@ -15,6 +15,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Boolean
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(propertyWithReceiverAnnotation.kt)
+    getContainingJvmClassName: PropertyWithReceiverAnnotationKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /prop
@@ -45,6 +47,7 @@ KtKotlinPropertySymbol:
         ]
         ownTypeArguments: []
         type: @R|ReceiverTypeAnnotation|()  kotlin/Long
+      getContainingFileSymbol: KtFileSymbol(propertyWithReceiverAnnotation.kt)
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     returnType: KtUsualClassType:
@@ -55,6 +58,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(propertyWithReceiverAnnotation.kt)
+    getContainingJvmClassName: PropertyWithReceiverAnnotationKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: false
@@ -88,6 +93,7 @@ KtKotlinPropertySymbol:
       ]
       ownTypeArguments: []
       type: @R|ReceiverTypeAnnotation|()  kotlin/Long
+    getContainingFileSymbol: KtFileSymbol(propertyWithReceiverAnnotation.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -98,9 +104,11 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(propertyWithReceiverAnnotation.kt)
+  getContainingJvmClassName: PropertyWithReceiverAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getProp
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.pretty.txt

@@ -1,3 +1,3 @@
 @SetAnnotation
 @ExplicitSetAnnotation
-set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)
+set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.txt

@@ -40,6 +40,8 @@ KtPropertySetterSymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(setterWithAnnotations.kt)
+    getContainingJvmClassName: null
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   receiverParameter: null
@@ -75,9 +77,13 @@ KtPropertySetterSymbol:
         type: kotlin/Int
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(setterWithAnnotations.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(setterWithAnnotations.kt)
+  getContainingJvmClassName: SetterWithAnnotationsKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationWithArgument.pretty.txt

@@ -1 +1 @@
-fun foo(): kotlin.collections.List<@Anno5(s = "1") kotlin.Int>?
+fun foo(): kotlin.collections.List<@Anno5(s = "1") kotlin.Int>?

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationWithArgument.txt

@@ -35,5 +35,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationWithArgument.kt)
+  getContainingJvmClassName: TypeAnnotationWithArgumentKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionParameterType.descriptors.txt

@@ -53,9 +53,13 @@ KtFunctionSymbol:
         type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionParameterType.kt)
+      getContainingJvmClassName: TypeAnnotationsOnFunctionParameterTypeKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionParameterType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionParameterType.pretty.txt

@@ -1 +1 @@
-fun foo(para: @Anno1 @Anno2 @Anno3 BaseInterface)
+fun foo(para: @Anno1 @Anno2 @Anno3 BaseInterface)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionParameterType.txt

@@ -53,9 +53,13 @@ KtFunctionSymbol:
         type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionParameterType.kt)
+      getContainingJvmClassName: TypeAnnotationsOnFunctionParameterTypeKt
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionParameterType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionReceiverType.descriptors.txt

@@ -33,6 +33,7 @@ KtFunctionSymbol:
       ]
       ownTypeArguments: []
       type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionReceiverType.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -43,5 +44,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionReceiverType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionReceiverTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionReceiverType.pretty.txt

@@ -1 +1 @@
-fun @Anno1 @Anno2 @Anno3 BaseInterface.foo()
+fun @Anno1 @Anno2 @Anno3 BaseInterface.foo()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionReceiverType.txt

@@ -33,6 +33,7 @@ KtFunctionSymbol:
       ]
       ownTypeArguments: []
       type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionReceiverType.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -43,5 +44,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionReceiverType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionReceiverTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionalTypeWithTypeAlias.descriptors.txt

@@ -39,5 +39,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionalTypeWithTypeAlias.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionalTypeWithTypeAliasKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnFunctionalTypeWithTypeAlias.txt

@@ -39,5 +39,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnFunctionalTypeWithTypeAlias.kt)
+  getContainingJvmClassName: TypeAnnotationsOnFunctionalTypeWithTypeAliasKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyGetterReturnType.descriptors.txt

@@ -26,5 +26,7 @@ KtPropertyGetterSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyGetterReturnType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyGetterReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyGetterReturnType.txt

@@ -26,5 +26,7 @@ KtPropertyGetterSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyGetterReturnType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyGetterReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReceiverType.descriptors.txt

@@ -15,6 +15,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /foo
@@ -46,6 +48,7 @@ KtKotlinPropertySymbol:
         ]
         ownTypeArguments: []
         type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     returnType: KtUsualClassType:
@@ -56,6 +59,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -90,6 +95,7 @@ KtKotlinPropertySymbol:
       ]
       ownTypeArguments: []
       type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -100,6 +106,8 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReceiverType.pretty.txt

@@ -1 +1 @@
-val @Anno1 @Anno2 @Anno3 BaseInterface.foo: kotlin.Int
+val @Anno1 @Anno2 @Anno3 BaseInterface.foo: kotlin.Int

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReceiverType.txt

@@ -15,6 +15,8 @@ KtKotlinPropertySymbol:
       type: kotlin/Int
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /foo
@@ -46,6 +48,7 @@ KtKotlinPropertySymbol:
         ]
         ownTypeArguments: []
         type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
     returnType: KtUsualClassType:
@@ -56,6 +59,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -90,6 +95,7 @@ KtKotlinPropertySymbol:
       ]
       ownTypeArguments: []
       type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   returnType: KtUsualClassType:
@@ -100,9 +106,11 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReceiverType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyReceiverTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getFoo
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReturnType.descriptors.txt

@@ -22,6 +22,8 @@ KtKotlinPropertySymbol:
       type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /foo
@@ -54,6 +56,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -89,6 +93,8 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReturnType.pretty.txt

@@ -1 +1 @@
-val foo: @Anno1 @Anno2 @Anno3 BaseInterface
+val foo: @Anno1 @Anno2 @Anno3 BaseInterface

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReturnType.txt

@@ -22,6 +22,8 @@ KtKotlinPropertySymbol:
       type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   callableIdIfNonLocal: /foo
@@ -54,6 +56,8 @@ KtKotlinPropertySymbol:
     typeParameters: []
     valueParameters: []
     visibility: Public
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+    getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   hasBackingField: true
@@ -89,9 +93,11 @@ KtKotlinPropertySymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertyReturnType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertyReturnTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getFoo
   javaSetterName: null
-  setterDeprecationStatus: null
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterType.descriptors.txt

@@ -37,6 +37,8 @@ KtPropertySetterSymbol:
       type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+    getContainingJvmClassName: null
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   receiverParameter: null
@@ -74,9 +76,13 @@ KtPropertySetterSymbol:
         type: @R|Anno3|() @R|Anno2|() @R|Anno1|()  @R|Anno3|()  SecondTypeAlias
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertySetterParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterType.pretty.txt

@@ -1 +1 @@
-set(value: @Anno1 @Anno2 @Anno3 BaseInterface)
+set(value: @Anno1 @Anno2 @Anno3 BaseInterface)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterType.txt

@@ -37,6 +37,8 @@ KtPropertySetterSymbol:
       type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+    getContainingJvmClassName: null
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   receiverParameter: null
@@ -74,9 +76,13 @@ KtPropertySetterSymbol:
         type: @R|Anno1|()  @R|Anno2|()  @R|Anno3|()  BaseInterface
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterType.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertySetterParameterTypeKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.descriptors.txt

@@ -37,6 +37,8 @@ KtPropertySetterSymbol:
       type: @R|Anno4|() @R|Anno2|() @R|Anno1|()  @R|Anno4|()  SecondTypeAlias
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+    getContainingJvmClassName: null
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   receiverParameter: null
@@ -74,9 +76,13 @@ KtPropertySetterSymbol:
         type: @R|Anno4|() @R|Anno2|() @R|Anno1|()  @R|Anno4|()  SecondTypeAlias
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.pretty.txt

@@ -1 +1 @@
-set(value: @Anno1 @Anno2 @Anno4 BaseInterface)
+set(value: @Anno1 @Anno2 @Anno4 BaseInterface)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.txt

@@ -37,6 +37,8 @@ KtPropertySetterSymbol:
       type: @R|Anno1|()  @R|Anno2|()  @R|Anno4|()  BaseInterface
     symbolKind: LOCAL
     typeParameters: []
+    getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+    getContainingJvmClassName: null
     getContainingModule: KtSourceModule "Sources of main"
     deprecationStatus: null
   receiverParameter: null
@@ -74,9 +76,13 @@ KtPropertySetterSymbol:
         type: @R|Anno1|()  @R|Anno2|()  @R|Anno4|()  BaseInterface
       symbolKind: LOCAL
       typeParameters: []
+      getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+      getContainingJvmClassName: null
       getContainingModule: KtSourceModule "Sources of main"
       deprecationStatus: null
   ]
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotation.kt)
+  getContainingJvmClassName: TypeAnnotationsOnPropertySetterParameterTypeWithAnotherAnnotationKt
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCall.descriptors.txt

@@ -30,6 +30,7 @@ KtNamedClassOrObjectSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperClassCall.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCall.pretty.txt

@@ -1 +1 @@
-class Foo : @Anno1 @Anno2 @Anno3 BaseClass()
+class Foo : @Anno1 @Anno2 @Anno3 BaseClass()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCall.txt

@@ -30,6 +30,7 @@ KtNamedClassOrObjectSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperClassCall.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCallOnAnonymousObject.descriptors.txt

@@ -21,6 +21,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperClassCallOnAnonymousObject.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCallOnAnonymousObject.pretty.txt

@@ -1 +1 @@
-object : @Anno1 @Anno2 @Anno3 BaseClass()
+object : @Anno1 @Anno2 @Anno3 BaseClass()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperClassCallOnAnonymousObject.txt

@@ -21,6 +21,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperClassCallOnAnonymousObject.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterface.descriptors.txt

@@ -34,6 +34,7 @@ KtNamedClassOrObjectSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperInterface.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterface.pretty.txt

@@ -1 +1 @@
-class Foo : @Anno1 @Anno2 @Anno3 BaseInterface
+class Foo : @Anno1 @Anno2 @Anno3 BaseInterface

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterface.txt

@@ -30,6 +30,7 @@ KtNamedClassOrObjectSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperInterface.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterfaceOnAnonymousObject.descriptors.txt

@@ -21,6 +21,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperInterfaceOnAnonymousObject.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
   deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterfaceOnAnonymousObject.pretty.txt

@@ -1 +1 @@
-object : @Anno1 @Anno2 @Anno3 BaseInterface
+object : @Anno1 @Anno2 @Anno3 BaseInterface

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnSuperInterfaceOnAnonymousObject.txt

@@ -21,6 +21,7 @@ KtAnonymousObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: []
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsOnSuperInterfaceOnAnonymousObject.kt)
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
-  deprecationStatus: null
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsWithTypeAlias.descriptors.txt

@@ -34,5 +34,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getContainingFileSymbol: KtFileSymbol(typeAnnotationsWithTypeAlias.kt)
+  getContainingJvmClassName: TypeAnnotationsWithTypeAliasKt
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null