Analysis API: rename KtCallableSymbol.type -> returnType

analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: foo
   origin: DELEGATED
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: bar
   origin: DELEGATED
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt

@@ -24,8 +24,8 @@ KtFunctionSymbol:
   name: test
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -51,9 +51,9 @@ KtKotlinPropertySymbol:
   name: testVal
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   deprecationStatus: null

analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: and
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -40,8 +40,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -66,8 +66,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -92,8 +92,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -118,8 +118,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -170,8 +170,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -196,8 +196,8 @@ KtFunctionSymbol:
   name: dec
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -220,8 +220,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -246,8 +246,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -272,8 +272,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -298,8 +298,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -324,8 +324,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -350,8 +350,8 @@ KtFunctionSymbol:
   name: div
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -376,8 +376,8 @@ KtFunctionSymbol:
   name: inc
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -400,8 +400,8 @@ KtFunctionSymbol:
   name: inv
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -424,8 +424,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -450,8 +450,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -476,8 +476,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -502,8 +502,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -528,8 +528,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -554,8 +554,8 @@ KtFunctionSymbol:
   name: minus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -580,8 +580,8 @@ KtFunctionSymbol:
   name: or
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -606,8 +606,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -632,8 +632,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -658,8 +658,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -684,8 +684,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -710,8 +710,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -736,8 +736,8 @@ KtFunctionSymbol:
   name: plus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -762,8 +762,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -788,8 +788,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -814,8 +814,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/LongRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/LongRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -840,8 +840,8 @@ KtFunctionSymbol:
   name: rangeTo
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/ranges/IntRange
   symbolKind: CLASS_MEMBER
-  type: kotlin/ranges/IntRange
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -869,8 +869,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -898,8 +898,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -927,8 +927,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -956,8 +956,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -985,8 +985,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1014,8 +1014,8 @@ KtFunctionSymbol:
   name: rem
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1040,8 +1040,8 @@ KtFunctionSymbol:
   name: shl
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1066,8 +1066,8 @@ KtFunctionSymbol:
   name: shr
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1092,8 +1092,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1118,8 +1118,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1144,8 +1144,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1170,8 +1170,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1196,8 +1196,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1222,8 +1222,8 @@ KtFunctionSymbol:
   name: times
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1248,8 +1248,8 @@ KtFunctionSymbol:
   name: toByte
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Byte
   symbolKind: CLASS_MEMBER
-  type: kotlin/Byte
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1272,8 +1272,8 @@ KtFunctionSymbol:
   name: toChar
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Char
   symbolKind: CLASS_MEMBER
-  type: kotlin/Char
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1296,8 +1296,8 @@ KtFunctionSymbol:
   name: toDouble
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Double
   symbolKind: CLASS_MEMBER
-  type: kotlin/Double
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1320,8 +1320,8 @@ KtFunctionSymbol:
   name: toFloat
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Float
   symbolKind: CLASS_MEMBER
-  type: kotlin/Float
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1344,8 +1344,8 @@ KtFunctionSymbol:
   name: toInt
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1368,8 +1368,8 @@ KtFunctionSymbol:
   name: toLong
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Long
   symbolKind: CLASS_MEMBER
-  type: kotlin/Long
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1392,8 +1392,8 @@ KtFunctionSymbol:
   name: toShort
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Short
   symbolKind: CLASS_MEMBER
-  type: kotlin/Short
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1416,8 +1416,8 @@ KtFunctionSymbol:
   name: unaryMinus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1440,8 +1440,8 @@ KtFunctionSymbol:
   name: unaryPlus
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1464,8 +1464,8 @@ KtFunctionSymbol:
   name: ushr
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(bitCount)
@@ -1490,8 +1490,8 @@ KtFunctionSymbol:
   name: xor
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1516,8 +1516,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -1542,8 +1542,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1566,8 +1566,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1604,8 +1604,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/Integer
   symbolKind: CLASS_MEMBER
-  type: java/lang/Integer
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1622,8 +1622,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Private

analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -40,8 +40,8 @@ KtFunctionSymbol:
   name: add
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -67,8 +67,8 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -94,8 +94,8 @@ KtFunctionSymbol:
   name: addAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -120,8 +120,8 @@ KtFunctionSymbol:
   name: clear
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -144,8 +144,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -168,8 +168,8 @@ KtFunctionSymbol:
   name: listIterator
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableListIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -194,8 +194,8 @@ KtFunctionSymbol:
   name: remove
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -220,8 +220,8 @@ KtFunctionSymbol:
   name: removeAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -246,8 +246,8 @@ KtFunctionSymbol:
   name: removeAt
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -272,8 +272,8 @@ KtFunctionSymbol:
   name: retainAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -298,8 +298,8 @@ KtFunctionSymbol:
   name: set
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -325,8 +325,8 @@ KtFunctionSymbol:
   name: subList
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/collections/MutableList<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableList<E>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(fromIndex)
@@ -352,8 +352,8 @@ KtFunctionSymbol:
   name: contains
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -378,8 +378,8 @@ KtFunctionSymbol:
   name: containsAll
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(elements)
@@ -404,8 +404,8 @@ KtFunctionSymbol:
   name: get
   origin: LIBRARY
   receiverType: null
+  returnType: E
   symbolKind: CLASS_MEMBER
-  type: E
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(index)
@@ -430,8 +430,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -456,8 +456,8 @@ KtFunctionSymbol:
   name: isEmpty
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -480,8 +480,8 @@ KtFunctionSymbol:
   name: iterator
   origin: INTERSECTION_OVERRIDE
   receiverType: null
+  returnType: kotlin/collections/MutableIterator<E>
   symbolKind: CLASS_MEMBER
-  type: kotlin/collections/MutableIterator<E>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -504,8 +504,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(element)
@@ -534,9 +534,9 @@ KtKotlinPropertySymbol:
   name: size
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): kotlin/collections/MutableList<E>
@@ -562,8 +562,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -588,8 +588,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -612,8 +612,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt

@@ -7,8 +7,8 @@ KtJavaFieldSymbol:
   name: value
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/CharArray, kotlin/CharArray?>
   visibility: Private
   deprecationStatus: null
 
@@ -21,8 +21,8 @@ KtJavaFieldSymbol:
   name: hash
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   visibility: Private
   deprecationStatus: null
 
@@ -42,8 +42,8 @@ KtFunctionSymbol:
   name: hash32
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: PackageVisibility
@@ -59,8 +59,8 @@ KtJavaFieldSymbol:
   name: hash32
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   visibility: Private
   deprecationStatus: null
 
@@ -84,9 +84,9 @@ KtSyntheticJavaPropertySymbol:
   name: length
   origin: JAVA_SYNTHETIC_PROPERTY
   receiverType: null
+  returnType: kotlin/Int
   setter: null
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   visibility: Public
   getDispatchReceiver(): java/lang/String
@@ -112,8 +112,8 @@ KtFunctionSymbol:
   name: isEmpty
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -136,8 +136,8 @@ KtFunctionSymbol:
   name: codePointAt
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -162,8 +162,8 @@ KtFunctionSymbol:
   name: codePointBefore
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -188,8 +188,8 @@ KtFunctionSymbol:
   name: codePointCount
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -215,8 +215,8 @@ KtFunctionSymbol:
   name: offsetByCodePoints
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -242,8 +242,8 @@ KtFunctionSymbol:
   name: getChars
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -269,8 +269,8 @@ KtFunctionSymbol:
   name: getChars
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -301,8 +301,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -330,8 +330,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -356,8 +356,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -382,8 +382,8 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/ByteArray, kotlin/ByteArray?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -406,8 +406,8 @@ KtFunctionSymbol:
   name: equals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -432,8 +432,8 @@ KtFunctionSymbol:
   name: contentEquals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -458,8 +458,8 @@ KtFunctionSymbol:
   name: contentEquals
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -484,8 +484,8 @@ KtFunctionSymbol:
   name: equalsIgnoreCase
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -510,8 +510,8 @@ KtFunctionSymbol:
   name: compareTo
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -536,8 +536,8 @@ KtFunctionSymbol:
   name: compareToIgnoreCase
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -562,8 +562,8 @@ KtFunctionSymbol:
   name: regionMatches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -591,8 +591,8 @@ KtFunctionSymbol:
   name: regionMatches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -621,8 +621,8 @@ KtFunctionSymbol:
   name: startsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -648,8 +648,8 @@ KtFunctionSymbol:
   name: startsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -674,8 +674,8 @@ KtFunctionSymbol:
   name: endsWith
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -700,8 +700,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -724,8 +724,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -750,8 +750,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -777,8 +777,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -803,8 +803,8 @@ KtFunctionSymbol:
   name: indexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -830,8 +830,8 @@ KtFunctionSymbol:
   name: indexOfSupplementary
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -857,8 +857,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -883,8 +883,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -910,8 +910,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -936,8 +936,8 @@ KtFunctionSymbol:
   name: lastIndexOf
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -963,8 +963,8 @@ KtFunctionSymbol:
   name: lastIndexOfSupplementary
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -990,8 +990,8 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1016,8 +1016,8 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1043,8 +1043,8 @@ KtFunctionSymbol:
   name: subSequence
   origin: JAVA
   receiverType: null
+  returnType: @EnhancedNullability kotlin/CharSequence
   symbolKind: CLASS_MEMBER
-  type: @EnhancedNullability kotlin/CharSequence
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1070,8 +1070,8 @@ KtFunctionSymbol:
   name: concat
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1096,8 +1096,8 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1123,8 +1123,8 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1150,8 +1150,8 @@ KtFunctionSymbol:
   name: matches
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1176,8 +1176,8 @@ KtFunctionSymbol:
   name: contains
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1202,8 +1202,8 @@ KtFunctionSymbol:
   name: replaceFirst
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1229,8 +1229,8 @@ KtFunctionSymbol:
   name: replaceAll
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1256,8 +1256,8 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1283,8 +1283,8 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1309,8 +1309,8 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1335,8 +1335,8 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1359,8 +1359,8 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1385,8 +1385,8 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1409,8 +1409,8 @@ KtFunctionSymbol:
   name: trim
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1433,8 +1433,8 @@ KtFunctionSymbol:
   name: toString
   origin: JAVA
   receiverType: null
+  returnType: @EnhancedNullability kotlin/String
   symbolKind: CLASS_MEMBER
-  type: @EnhancedNullability kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1457,8 +1457,8 @@ KtFunctionSymbol:
   name: toCharArray
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/CharArray, kotlin/CharArray?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1481,8 +1481,8 @@ KtFunctionSymbol:
   name: intern
   origin: JAVA
   receiverType: null
+  returnType: ft<kotlin/String, kotlin/String?>
   symbolKind: CLASS_MEMBER
-  type: ft<kotlin/String, kotlin/String?>
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1505,8 +1505,8 @@ KtFunctionSymbol:
   name: get
   origin: JAVA
   receiverType: null
+  returnType: kotlin/Char
   symbolKind: CLASS_MEMBER
-  type: kotlin/Char
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1547,8 +1547,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -1563,8 +1563,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1581,8 +1581,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1599,8 +1599,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1619,8 +1619,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1642,8 +1642,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1666,8 +1666,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1685,8 +1685,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1706,8 +1706,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1727,8 +1727,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1746,8 +1746,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1765,8 +1765,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1785,8 +1785,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1803,8 +1803,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1821,8 +1821,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1839,8 +1839,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)
@@ -1861,8 +1861,8 @@ KtConstructorSymbol:
   isPrimary: false
   origin: JAVA
   receiverType: null
+  returnType: java/lang/String
   symbolKind: CLASS_MEMBER
-  type: java/lang/String
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p0)

analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: invoke
   origin: LIBRARY
   receiverType: null
+  returnType: R
   symbolKind: CLASS_MEMBER
-  type: R
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(p1)
@@ -41,8 +41,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -67,8 +67,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -91,8 +91,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public

analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt

@@ -14,8 +14,8 @@ KtFunctionSymbol:
   name: funWithOuterAndOwnGenericsAndBounds
   origin: SOURCE
   receiverType: null
+  returnType: kotlin/Unit
   symbolKind: CLASS_MEMBER
-  type: kotlin/Unit
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -48,9 +48,9 @@ KtKotlinPropertySymbol:
   name: propWithOuterAndOwnGenericsAndBounds
   origin: SOURCE
   receiverType: test/TwoParams<TT1, TT2>
+  returnType: test/Foo?
   setter: null
   symbolKind: CLASS_MEMBER
-  type: test/Foo?
   typeParameters: [
     KtTypeParameterSymbol(TT1)
     KtTypeParameterSymbol(TT2)
@@ -79,8 +79,8 @@ KtFunctionSymbol:
   name: equals
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Boolean
   symbolKind: CLASS_MEMBER
-  type: kotlin/Boolean
   typeParameters: []
   valueParameters: [
     KtValueParameterSymbol(other)
@@ -105,8 +105,8 @@ KtFunctionSymbol:
   name: hashCode
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/Int
   symbolKind: CLASS_MEMBER
-  type: kotlin/Int
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -129,8 +129,8 @@ KtFunctionSymbol:
   name: toString
   origin: LIBRARY
   receiverType: null
+  returnType: kotlin/String
   symbolKind: CLASS_MEMBER
-  type: kotlin/String
   typeParameters: []
   valueParameters: []
   visibility: Public
@@ -146,8 +146,8 @@ KtConstructorSymbol:
   isPrimary: true
   origin: SOURCE_MEMBER_GENERATED
   receiverType: null
+  returnType: test/MyClass
   symbolKind: CLASS_MEMBER
-  type: test/MyClass
   typeParameters: []
   valueParameters: []
   visibility: Public