[FIR IDE] Update Analysis API test data, untie it from the FIR implementation

analysis/analysis-api/testData/symbols/symbolByFqName/class.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: kotlin/Lazy
@@ -17,7 +17,7 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: java/lang/String

analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt

@@ -1,4 +1,4 @@
-KtFirEnumEntrySymbol:
+KtEnumEntrySymbol:
   annotatedType: [] kotlin/LazyThreadSafetyMode
   callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED
   containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode

analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: []
   annotations: []
@@ -19,15 +19,15 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   valueParameters: [
-    KtFirValueParameterSymbol(element)
+    KtValueParameterSymbol(element)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: [
     kotlin/internal/InlineOnly
@@ -53,13 +53,13 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: []
   annotations: []
@@ -80,10 +80,10 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   valueParameters: [
-    KtFirValueParameterSymbol(elements)
+    KtValueParameterSymbol(elements)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: kotlin/collections/Iterator
@@ -17,7 +17,7 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: kotlin/io/FileWalkDirection

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] E
   annotationClassIds: []
   annotations: []
@@ -20,7 +20,7 @@ KtFirFunctionSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(index)
+    KtValueParameterSymbol(index)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/collections/ListIterator<E>
   annotationClassIds: []
   annotations: []
@@ -23,7 +23,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/collections/ListIterator<E>
   annotationClassIds: []
   annotations: []
@@ -45,7 +45,7 @@ KtFirFunctionSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(index)
+    KtValueParameterSymbol(index)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry
@@ -17,8 +17,8 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
-    KtFirTypeParameterSymbol(K)
-    KtFirTypeParameterSymbol(V)
+    KtTypeParameterSymbol(K)
+    KtTypeParameterSymbol(V)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -26,7 +26,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] Anno
   annotationClassIds: []
   annotations: []
@@ -41,13 +41,13 @@ KtFirConstructorSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(param1)
-    KtFirValueParameterSymbol(param2)
+    KtValueParameterSymbol(param1)
+    KtValueParameterSymbol(param2)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: Anno
@@ -69,7 +69,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: [
     Anno
@@ -99,7 +99,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     Anno
   ]

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -23,13 +23,13 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
   dispatchType: <anonymous>
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -54,7 +54,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirAnonymousObjectSymbol:
+KtAnonymousObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: null
@@ -67,13 +67,13 @@ KtFirAnonymousObjectSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] java/lang/Runnable
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   dispatchType: AnonymousContainer
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -98,7 +98,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: AnonymousContainer

analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt

@@ -1,4 +1,4 @@
-KtFirPropertyGetterSymbol:
+KtPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -18,7 +18,7 @@ KtFirPropertyGetterSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -32,7 +32,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirPropertySetterSymbol:
+KtPropertySetterSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -46,22 +46,22 @@ KtFirPropertySetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  parameter: KtFirValueParameterSymbol(value)
+  parameter: KtValueParameterSymbol(value)
   receiverType: null
   symbolKind: ACCESSOR
   valueParameters: [
-    KtFirValueParameterSymbol(value)
+    KtValueParameterSymbol(value)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /p
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: true
@@ -77,7 +77,7 @@ KtFirKotlinPropertySymbol:
   name: p
   origin: SOURCE
   receiverType: null
-  setter: KtFirPropertySetterSymbol(<setter>)
+  setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/class.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt

@@ -1,10 +1,10 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.i
   dispatchType: A
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -29,12 +29,12 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirClassInitializerSymbol:
+KtClassInitializerSymbol:
   origin: SOURCE
   symbolKind: CLASS_MEMBER
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt

@@ -1,10 +1,10 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.a
   dispatchType: A
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -54,7 +54,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt

@@ -1,4 +1,4 @@
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
@@ -16,7 +16,7 @@ KtFirConstructorSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt

@@ -1,4 +1,4 @@
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
@@ -16,7 +16,7 @@ KtFirConstructorSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -30,7 +30,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
@@ -45,12 +45,12 @@ KtFirConstructorSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(x)
+    KtValueParameterSymbol(x)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -64,7 +64,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -78,7 +78,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
@@ -93,13 +93,13 @@ KtFirConstructorSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(y)
-    KtFirValueParameterSymbol(z)
+    KtValueParameterSymbol(y)
+    KtValueParameterSymbol(z)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt

@@ -1,4 +1,4 @@
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T
   origin: SOURCE
@@ -8,7 +8,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: R
   origin: SOURCE
@@ -18,7 +18,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A
@@ -37,8 +37,8 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
-    KtFirTypeParameterSymbol(R)
+    KtTypeParameterSymbol(T)
+    KtTypeParameterSymbol(R)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt

@@ -1,4 +1,4 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -9,7 +9,7 @@ KtFirKotlinPropertySymbol:
   ]
   callableIdIfNonLocal: /i
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -34,13 +34,13 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i2
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -65,13 +65,13 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i3
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: true
@@ -87,7 +87,7 @@ KtFirKotlinPropertySymbol:
   name: i3
   origin: SOURCE
   receiverType: null
-  setter: KtFirPropertySetterSymbol(<setter>)
+  setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
   visibility: Public
   deprecationStatus: null
@@ -96,13 +96,13 @@ KtFirKotlinPropertySymbol:
   javaSetterName: setI3
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3)
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i4
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: true
@@ -118,7 +118,7 @@ KtFirKotlinPropertySymbol:
   name: i4
   origin: SOURCE
   receiverType: null
-  setter: KtFirPropertySetterSymbol(<setter>)
+  setter: KtPropertySetterSymbol(<setter>)
   symbolKind: TOP_LEVEL
   visibility: Public
   deprecationStatus: null
@@ -127,7 +127,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: setI4
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4)
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -157,7 +157,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f)
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     kotlin/Deprecated
   ]
@@ -184,7 +184,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass)
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -195,7 +195,7 @@ KtFirKotlinPropertySymbol:
   ]
   callableIdIfNonLocal: /Foo.i2
   dispatchType: Foo
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -220,7 +220,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -250,7 +250,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: Foo
@@ -272,7 +272,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -283,7 +283,7 @@ KtFirKotlinPropertySymbol:
   ]
   callableIdIfNonLocal: /j
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -308,7 +308,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/Deprecated
@@ -319,7 +319,7 @@ KtFirKotlinPropertySymbol:
   ]
   callableIdIfNonLocal: /j2
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -344,7 +344,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     java/lang/Deprecated
@@ -355,7 +355,7 @@ KtFirKotlinPropertySymbol:
   ]
   callableIdIfNonLocal: /j2
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false

analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt

@@ -1,4 +1,4 @@
-KtFirEnumEntrySymbol:
+KtEnumEntrySymbol:
   annotatedType: [] X
   callableIdIfNonLocal: /X.Y
   containingEnumClassIdIfNonLocal: X
@@ -9,7 +9,7 @@ KtFirEnumEntrySymbol:
   symbolKind: CLASS_MEMBER
   deprecationStatus: null
 
-KtFirEnumEntrySymbol:
+KtEnumEntrySymbol:
   annotatedType: [] X
   callableIdIfNonLocal: /X.Z
   containingEnumClassIdIfNonLocal: X
@@ -20,7 +20,7 @@ KtFirEnumEntrySymbol:
   symbolKind: CLASS_MEMBER
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] Style
   annotationClassIds: []
   annotations: []
@@ -27,12 +27,12 @@ KtFirConstructorSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(value)
+    KtValueParameterSymbol(value)
   ]
   visibility: Private
   deprecationStatus: null
 
-KtFirPropertyGetterSymbol:
+KtPropertyGetterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
@@ -52,13 +52,13 @@ KtFirPropertyGetterSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
   dispatchType: <anonymous>
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
   hasSetter: false
@@ -83,7 +83,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirEnumEntrySymbol:
+KtEnumEntrySymbol:
   annotatedType: [] Style
   callableIdIfNonLocal: /Style.SHEET
   containingEnumClassIdIfNonLocal: Style
@@ -94,13 +94,13 @@ KtFirEnumEntrySymbol:
   symbolKind: CLASS_MEMBER
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Style.exitAnimation
   dispatchType: Style
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
   hasSetter: false
@@ -125,7 +125,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: Style

analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []

analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt

@@ -1,4 +1,4 @@
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
@@ -9,7 +9,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []

analysis/analysis-api/testData/symbols/symbolByPsi/function.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -34,7 +34,7 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(x)
+    KtValueParameterSymbol(x)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt

@@ -1,4 +1,4 @@
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: X
   origin: SOURCE
@@ -8,7 +8,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] X
   annotationClassIds: []
   annotations: []
@@ -22,7 +22,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -43,10 +43,10 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(X)
+    KtTypeParameterSymbol(X)
   ]
   valueParameters: [
-    KtFirValueParameterSymbol(x)
+    KtValueParameterSymbol(x)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
@@ -27,12 +27,12 @@ KtFirConstructorSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(i)
+    KtValueParameterSymbol(i)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []

analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
@@ -23,7 +23,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirAnonymousFunctionSymbol:
+KtAnonymousFunctionSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
@@ -32,11 +32,11 @@ KtFirAnonymousFunctionSymbol:
   receiverType: null
   symbolKind: LOCAL
   valueParameters: [
-    KtFirValueParameterSymbol(a)
+    KtValueParameterSymbol(a)
   ]
   deprecationStatus: null
 
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
   callableIdIfNonLocal: null
   isExtension: false
@@ -47,7 +47,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -61,7 +61,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
@@ -72,7 +72,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirAnonymousFunctionSymbol:
+KtAnonymousFunctionSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
@@ -81,11 +81,11 @@ KtFirAnonymousFunctionSymbol:
   receiverType: null
   symbolKind: LOCAL
   valueParameters: [
-    KtFirValueParameterSymbol(a)
+    KtValueParameterSymbol(a)
   ]
   deprecationStatus: null
 
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
   callableIdIfNonLocal: null
   isExtension: false
@@ -96,7 +96,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
@@ -107,7 +107,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirAnonymousFunctionSymbol:
+KtAnonymousFunctionSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   hasStableParameterNames: true
@@ -116,11 +116,11 @@ KtFirAnonymousFunctionSymbol:
   receiverType: null
   symbolKind: LOCAL
   valueParameters: [
-    KtFirValueParameterSymbol(it)
+    KtValueParameterSymbol(it)
   ]
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -145,7 +145,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Function1<kotlin/Int, kotlin/Int>
   annotationClassIds: []
   annotations: []
@@ -159,7 +159,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -181,7 +181,7 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(lmbd)
+    KtValueParameterSymbol(lmbd)
   ]
   visibility: Private
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt

@@ -1,10 +1,10 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.i
   dispatchType: Foo
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: true
@@ -20,7 +20,7 @@ KtFirKotlinPropertySymbol:
   name: i
   origin: SOURCE
   receiverType: null
-  setter: KtFirPropertySetterSymbol(<setter>)
+  setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
   deprecationStatus: null
@@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: setMyI
   setterDeprecationStatus: null
 
-KtFirPropertyGetterSymbol:
+KtPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [
     kotlin/jvm/JvmName
@@ -54,7 +54,7 @@ KtFirPropertyGetterSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -68,7 +68,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirPropertySetterSymbol:
+KtPropertySetterSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: [
     kotlin/jvm/JvmName
@@ -87,22 +87,22 @@ KtFirPropertySetterSymbol:
   isOverride: false
   modality: FINAL
   origin: SOURCE
-  parameter: KtFirValueParameterSymbol(value)
+  parameter: KtValueParameterSymbol(value)
   receiverType: null
   symbolKind: ACCESSOR
   valueParameters: [
-    KtFirValueParameterSymbol(value)
+    KtValueParameterSymbol(value)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.j
   dispatchType: Foo
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
   hasSetter: true
@@ -118,7 +118,7 @@ KtFirKotlinPropertySymbol:
   name: j
   origin: SOURCE
   receiverType: null
-  setter: KtFirPropertySetterSymbol(<setter>)
+  setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
   deprecationStatus: null
@@ -127,7 +127,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: setMyJ
   setterDeprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: Foo

analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt

@@ -1,4 +1,4 @@
-KtFirLocalVariableSymbol:
+KtLocalVariableSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
@@ -9,7 +9,7 @@ KtFirLocalVariableSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -34,7 +34,7 @@ KtFirFunctionSymbol:
   visibility: Local
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: null
@@ -56,7 +56,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Local
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []

analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -23,7 +23,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -48,7 +48,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt

@@ -1,10 +1,10 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.x
   dispatchType: A
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirPropertyGetterSymbol:
+KtPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -49,13 +49,13 @@ KtFirPropertyGetterSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.y
   dispatchType: A
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
   hasSetter: false
@@ -80,7 +80,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: A

analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt

@@ -1,4 +1,4 @@
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T
   origin: SOURCE
@@ -8,7 +8,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T1
   origin: SOURCE
@@ -18,7 +18,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X.Y
@@ -37,12 +37,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
-    KtFirTypeParameterSymbol(T1)
+    KtTypeParameterSymbol(T1)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T2
   origin: SOURCE
@@ -52,7 +52,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X.Z
@@ -71,12 +71,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: [
-    KtFirTypeParameterSymbol(T2)
+    KtTypeParameterSymbol(T2)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T3
   origin: SOURCE
@@ -86,7 +86,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T4
   origin: SOURCE
@@ -96,7 +96,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T5
   origin: SOURCE
@@ -106,7 +106,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: null
@@ -125,12 +125,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: [
-    KtFirTypeParameterSymbol(T5)
+    KtTypeParameterSymbol(T5)
   ]
   visibility: Local
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T6
   origin: SOURCE
@@ -140,7 +140,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: null
@@ -159,12 +159,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: [
-    KtFirTypeParameterSymbol(T6)
+    KtTypeParameterSymbol(T6)
   ]
   visibility: Local
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: null
@@ -183,12 +183,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: LOCAL
   typeParameters: [
-    KtFirTypeParameterSymbol(T4)
+    KtTypeParameterSymbol(T4)
   ]
   visibility: Local
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -209,13 +209,13 @@ KtFirFunctionSymbol:
   receiverType: null
   symbolKind: CLASS_MEMBER
   typeParameters: [
-    KtFirTypeParameterSymbol(T3)
+    KtTypeParameterSymbol(T3)
   ]
   valueParameters: []
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X
@@ -234,7 +234,7 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt

@@ -1,4 +1,4 @@
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -23,7 +23,7 @@ KtFirFunctionSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt

@@ -1,10 +1,10 @@
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /x
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirPropertyGetterSymbol:
+KtPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -49,13 +49,13 @@ KtFirPropertyGetterSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /y
   dispatchType: null
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
   hasSetter: false

analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt

@@ -1,4 +1,4 @@
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: T
   origin: SOURCE
@@ -8,7 +8,7 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X
@@ -27,12 +27,12 @@ KtFirNamedClassOrObjectSymbol:
   ]
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(T)
+    KtTypeParameterSymbol(T)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirTypeParameterSymbol:
+KtTypeParameterSymbol:
   isReified: false
   name: Z
   origin: SOURCE
@@ -42,14 +42,14 @@ KtFirTypeParameterSymbol:
   variance: INVARIANT
   deprecationStatus: null
 
-KtFirTypeAliasSymbol:
+KtTypeAliasSymbol:
   classIdIfNonLocal: Y
   expandedType: X<Z>
   name: Y
   origin: SOURCE
   symbolKind: TOP_LEVEL
   typeParameters: [
-    KtFirTypeParameterSymbol(Z)
+    KtTypeParameterSymbol(Z)
   ]
   visibility: Private
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt

@@ -1,4 +1,4 @@
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     kotlin/annotation/Target
   ]
@@ -25,7 +25,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     kotlin/annotation/Target
   ]
@@ -52,7 +52,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     kotlin/annotation/Target
   ]
@@ -79,7 +79,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: [
     kotlin/annotation/Target
   ]
@@ -106,7 +106,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: I
@@ -128,7 +128,7 @@ KtFirNamedClassOrObjectSymbol:
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [
     Anno2()
       psi: KtAnnotationEntry
@@ -145,7 +145,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [
     Anno3()
       psi: KtAnnotationEntry
@@ -170,12 +170,12 @@ KtFirFunctionSymbol:
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(arg)
+    KtValueParameterSymbol(arg)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirKotlinPropertySymbol:
+KtKotlinPropertySymbol:
   annotatedType: [
     Anno4()
       psi: KtAnnotationEntry
@@ -184,7 +184,7 @@ KtFirKotlinPropertySymbol:
   annotations: []
   callableIdIfNonLocal: /X.x
   dispatchType: X
-  getter: KtFirPropertyGetterSymbol(<getter>)
+  getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
   hasSetter: false
@@ -209,7 +209,7 @@ KtFirKotlinPropertySymbol:
   javaSetterName: null
   setterDeprecationStatus: null
 
-KtFirNamedClassOrObjectSymbol:
+KtNamedClassOrObjectSymbol:
   annotationClassIds: []
   annotations: []
   classIdIfNonLocal: X

analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt

@@ -1,4 +1,4 @@
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
@@ -12,7 +12,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -34,12 +34,12 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(a)
+    KtValueParameterSymbol(a)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Float?
   annotationClassIds: []
   annotations: []
@@ -53,7 +53,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -75,12 +75,12 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(b)
+    KtValueParameterSymbol(b)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] kotlin/Any
   annotationClassIds: []
   annotations: []
@@ -94,7 +94,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -116,12 +116,12 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(c)
+    KtValueParameterSymbol(c)
   ]
   visibility: Public
   deprecationStatus: null
 
-KtFirValueParameterSymbol:
+KtValueParameterSymbol:
   annotatedType: [] ERROR CLASS: Symbol not found for Unresolved
   annotationClassIds: []
   annotations: []
@@ -135,7 +135,7 @@ KtFirValueParameterSymbol:
   symbolKind: LOCAL
   deprecationStatus: null
 
-KtFirFunctionSymbol:
+KtFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
@@ -157,7 +157,7 @@ KtFirFunctionSymbol:
   symbolKind: TOP_LEVEL
   typeParameters: []
   valueParameters: [
-    KtFirValueParameterSymbol(d)
+    KtValueParameterSymbol(d)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt

@@ -1,10 +1,10 @@
-KtFirBackingFieldSymbol:
+KtBackingFieldSymbol:
   annotatedType: [] kotlin/Int
   callableIdIfNonLocal: null
   isExtension: false
   name: field
   origin: PROPERTY_BACKING_FIELD
-  owningProperty: KtFirKotlinPropertySymbol(x)
+  owningProperty: KtKotlinPropertySymbol(x)
   receiverType: null
   symbolKind: LOCAL
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt

@@ -1,4 +1,4 @@
-KtFirConstructorSymbol:
+KtConstructorSymbol:
   annotatedType: [] java/util/ArrayList<E>
   annotationClassIds: []
   annotations: []
@@ -12,10 +12,10 @@ KtFirConstructorSymbol:
   receiverType: null
   symbolKind: CLASS_MEMBER
   typeParameters: [
-    KtFirTypeParameterSymbol(E)
+    KtTypeParameterSymbol(E)
   ]
   valueParameters: [
-    KtFirValueParameterSymbol(p0)
+    KtValueParameterSymbol(p0)
   ]
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt

@@ -1,4 +1,4 @@
-KtFirSamConstructorSymbol:
+KtSamConstructorSymbol:
   annotatedType: [] java/lang/Runnable
   callableIdIfNonLocal: java/lang/Runnable
   hasStableParameterNames: true
@@ -8,6 +8,6 @@ KtFirSamConstructorSymbol:
   receiverType: null
   symbolKind: SAM_CONSTRUCTOR
   valueParameters: [
-    KtFirValueParameterSymbol(function)
+    KtValueParameterSymbol(function)
   ]
   deprecationStatus: null