diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt index 596271da865..67dabefb240 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /I.foo hasStableParameterNames: true isExtension: false @@ -17,8 +15,9 @@ KtFunctionSymbol: origin: DELEGATED receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): A - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt index ce2bf1d07e7..5fd08e93261 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /I2.bar hasStableParameterNames: true isExtension: false @@ -17,8 +15,9 @@ KtFunctionSymbol: origin: DELEGATED receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): B - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt index f5eded3ae15..b453ffe4248 100644 --- a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt +++ b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt @@ -1,7 +1,6 @@ FILE SYMBOL: KtFileSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] origin: SOURCE deprecationStatus: null @@ -10,9 +9,7 @@ CALLABLE NAMES: CALLABLE SYMBOLS: KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /test hasStableParameterNames: true isExtension: false @@ -28,15 +25,14 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /testVal getter: KtPropertyGetterSymbol() hasBackingField: true @@ -57,6 +53,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -70,8 +67,7 @@ CLASSIFIER NAMES: CLASSIFIER SYMBOLS: KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: C classKind: CLASS companionObject: null @@ -84,7 +80,7 @@ KtNamedClassOrObjectSymbol: name: C origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -92,8 +88,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: I classKind: INTERFACE companionObject: null @@ -106,9 +101,9 @@ KtNamedClassOrObjectSymbol: name: I origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt index 08c8921b064..3fc35485290 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.and hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -26,9 +25,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -44,6 +41,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -53,9 +51,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -71,6 +67,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -80,9 +77,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -98,6 +93,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -107,9 +103,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -125,6 +119,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -134,9 +129,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -152,6 +145,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -161,9 +155,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.compareTo hasStableParameterNames: true isExtension: false @@ -179,6 +171,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -188,9 +181,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.dec hasStableParameterNames: true isExtension: false @@ -206,6 +197,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -213,9 +205,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -231,6 +221,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -240,9 +231,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -258,6 +247,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -267,9 +257,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -285,6 +273,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -294,9 +283,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -312,6 +299,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -321,9 +309,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -339,6 +325,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -348,9 +335,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.div hasStableParameterNames: true isExtension: false @@ -366,6 +351,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -375,9 +361,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.inc hasStableParameterNames: true isExtension: false @@ -393,6 +377,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -400,9 +385,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.inv hasStableParameterNames: true isExtension: false @@ -418,6 +401,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -425,9 +409,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -443,6 +425,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -452,9 +435,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -470,6 +451,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -479,9 +461,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -497,6 +477,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -506,9 +487,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -524,6 +503,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -533,9 +513,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -551,6 +529,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -560,9 +539,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.minus hasStableParameterNames: true isExtension: false @@ -578,6 +555,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -587,9 +565,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.or hasStableParameterNames: true isExtension: false @@ -605,6 +581,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -614,9 +591,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -632,6 +607,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -641,9 +617,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -659,6 +633,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -668,9 +643,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -686,6 +659,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -695,9 +669,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -713,6 +685,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -722,9 +695,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -740,6 +711,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -749,9 +721,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.plus hasStableParameterNames: true isExtension: false @@ -767,6 +737,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -776,9 +747,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/ranges/IntRange - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.rangeTo hasStableParameterNames: true isExtension: false @@ -794,6 +763,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/ranges/IntRange typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -803,9 +773,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/ranges/IntRange - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.rangeTo hasStableParameterNames: true isExtension: false @@ -821,6 +789,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/ranges/IntRange typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -830,9 +799,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/ranges/LongRange - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.rangeTo hasStableParameterNames: true isExtension: false @@ -848,6 +815,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/ranges/LongRange typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -857,9 +825,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/ranges/IntRange - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.rangeTo hasStableParameterNames: true isExtension: false @@ -875,6 +841,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/ranges/IntRange typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -884,11 +851,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -907,6 +870,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -916,11 +880,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -939,6 +899,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -948,11 +909,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -971,6 +928,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -980,11 +938,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -1003,6 +957,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1012,11 +967,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -1035,6 +986,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1044,11 +996,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/SinceKotlin - ] - annotations: [ + annotationsList: [ kotlin/SinceKotlin(version = 1.1) psi: null ] @@ -1067,6 +1015,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1076,9 +1025,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.shl hasStableParameterNames: true isExtension: false @@ -1094,6 +1041,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(bitCount) @@ -1103,9 +1051,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.shr hasStableParameterNames: true isExtension: false @@ -1121,6 +1067,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(bitCount) @@ -1130,9 +1077,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1148,6 +1093,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1157,9 +1103,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1175,6 +1119,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1184,9 +1129,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1202,6 +1145,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1211,9 +1155,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1229,6 +1171,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1238,9 +1181,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1256,6 +1197,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1265,9 +1207,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.times hasStableParameterNames: true isExtension: false @@ -1283,6 +1223,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1292,9 +1233,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Byte - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toByte hasStableParameterNames: true isExtension: false @@ -1310,6 +1249,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Byte typeParameters: [] valueParameters: [] visibility: Public @@ -1317,9 +1257,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Char - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toChar hasStableParameterNames: true isExtension: false @@ -1335,6 +1273,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Char typeParameters: [] valueParameters: [] visibility: Public @@ -1342,9 +1281,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Double - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toDouble hasStableParameterNames: true isExtension: false @@ -1360,6 +1297,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Double typeParameters: [] valueParameters: [] visibility: Public @@ -1367,9 +1305,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Float - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toFloat hasStableParameterNames: true isExtension: false @@ -1385,6 +1321,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Float typeParameters: [] valueParameters: [] visibility: Public @@ -1392,9 +1329,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toInt hasStableParameterNames: true isExtension: false @@ -1410,6 +1345,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -1417,9 +1353,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Long - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toLong hasStableParameterNames: true isExtension: false @@ -1435,6 +1369,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Long typeParameters: [] valueParameters: [] visibility: Public @@ -1442,9 +1377,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Short - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.toShort hasStableParameterNames: true isExtension: false @@ -1460,6 +1393,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Short typeParameters: [] valueParameters: [] visibility: Public @@ -1467,9 +1401,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.unaryMinus hasStableParameterNames: true isExtension: false @@ -1485,6 +1417,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -1492,9 +1425,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.unaryPlus hasStableParameterNames: true isExtension: false @@ -1510,6 +1441,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -1517,9 +1449,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.ushr hasStableParameterNames: true isExtension: false @@ -1535,6 +1465,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(bitCount) @@ -1544,9 +1475,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Int.xor hasStableParameterNames: true isExtension: false @@ -1562,6 +1491,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1571,9 +1501,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.equals hasStableParameterNames: true isExtension: false @@ -1589,6 +1517,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -1598,9 +1527,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.hashCode hasStableParameterNames: true isExtension: false @@ -1616,6 +1543,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -1623,9 +1551,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.toString hasStableParameterNames: true isExtension: false @@ -1641,6 +1567,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] valueParameters: [] visibility: Public @@ -1648,8 +1575,7 @@ KtFunctionSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: kotlin/Int.Companion classKind: COMPANION_OBJECT companionObject: null @@ -1662,7 +1588,7 @@ KtNamedClassOrObjectSymbol: name: Companion origin: LIBRARY superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: CLASS_MEMBER typeParameters: [] @@ -1670,9 +1596,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/Integer - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: kotlin/Int hasStableParameterNames: false @@ -1681,6 +1605,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/Integer typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1689,9 +1614,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: kotlin/Int hasStableParameterNames: true @@ -1700,6 +1623,7 @@ KtConstructorSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Private diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt index c5434e97a03..8589bb51399 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.add hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(element) @@ -26,9 +25,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.add hasStableParameterNames: true isExtension: false @@ -44,6 +41,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -54,9 +52,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.addAll hasStableParameterNames: true isExtension: false @@ -72,6 +68,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -82,9 +79,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.addAll hasStableParameterNames: true isExtension: false @@ -100,6 +95,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(elements) @@ -109,9 +105,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.clear hasStableParameterNames: true isExtension: false @@ -127,6 +121,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public @@ -134,9 +129,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/MutableListIterator - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.listIterator hasStableParameterNames: true isExtension: false @@ -152,6 +145,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/MutableListIterator typeParameters: [] valueParameters: [] visibility: Public @@ -159,9 +153,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/MutableListIterator - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.listIterator hasStableParameterNames: true isExtension: false @@ -177,6 +169,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/MutableListIterator typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -186,9 +179,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.remove hasStableParameterNames: true isExtension: false @@ -204,6 +195,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(element) @@ -213,9 +205,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.removeAll hasStableParameterNames: true isExtension: false @@ -231,6 +221,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(elements) @@ -240,9 +231,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] E - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.removeAt hasStableParameterNames: true isExtension: false @@ -258,6 +247,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: E typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -267,9 +257,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.retainAll hasStableParameterNames: true isExtension: false @@ -285,6 +273,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(elements) @@ -294,9 +283,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] E - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.set hasStableParameterNames: true isExtension: false @@ -312,6 +299,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: E typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -322,9 +310,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/MutableList - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.subList hasStableParameterNames: true isExtension: false @@ -340,6 +326,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/MutableList typeParameters: [] valueParameters: [ KtValueParameterSymbol(fromIndex) @@ -350,9 +337,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.contains hasStableParameterNames: true isExtension: false @@ -368,6 +353,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(element) @@ -377,9 +363,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.containsAll hasStableParameterNames: true isExtension: false @@ -395,6 +379,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(elements) @@ -404,9 +389,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] E - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.get hasStableParameterNames: true isExtension: false @@ -422,6 +405,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: E typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) @@ -431,9 +415,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.indexOf hasStableParameterNames: true isExtension: false @@ -449,6 +431,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(element) @@ -458,9 +441,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty hasStableParameterNames: true isExtension: false @@ -476,6 +457,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [] visibility: Public @@ -483,9 +465,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/MutableIterator - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.iterator hasStableParameterNames: true isExtension: false @@ -501,6 +481,7 @@ KtFunctionSymbol: origin: INTERSECTION_OVERRIDE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/MutableIterator typeParameters: [] valueParameters: [] visibility: Public @@ -508,9 +489,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.lastIndexOf hasStableParameterNames: true isExtension: false @@ -526,6 +505,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(element) @@ -535,9 +515,7 @@ KtFunctionSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/MutableList.size getter: null hasBackingField: false @@ -558,6 +536,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): kotlin/collections/MutableList @@ -568,9 +547,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.equals hasStableParameterNames: true isExtension: false @@ -586,6 +563,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -595,9 +573,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.hashCode hasStableParameterNames: true isExtension: false @@ -613,6 +589,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -620,9 +597,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.toString hasStableParameterNames: true isExtension: false @@ -638,8 +613,9 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): kotlin/Any - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt index 0c80b3fa022..f7f169cc8ac 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt @@ -1,5 +1,4 @@ KtJavaFieldSymbol: - annotatedType: [] ft callableIdIfNonLocal: java/lang/String.value isExtension: false isStatic: false @@ -9,11 +8,11 @@ KtJavaFieldSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft visibility: Private deprecationStatus: null KtJavaFieldSymbol: - annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash isExtension: false isStatic: false @@ -23,13 +22,12 @@ KtJavaFieldSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int visibility: Private deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.hash32 hasStableParameterNames: false isExtension: false @@ -45,6 +43,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: PackageVisibility @@ -52,7 +51,6 @@ KtFunctionSymbol: deprecationStatus: null KtJavaFieldSymbol: - annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash32 isExtension: false isStatic: false @@ -62,13 +60,12 @@ KtJavaFieldSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int visibility: Private deprecationStatus: null KtSyntheticJavaPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.length getter: KtPropertyGetterSymbol() hasBackingField: true @@ -89,6 +86,7 @@ KtSyntheticJavaPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): java/lang/String @@ -99,9 +97,7 @@ KtSyntheticJavaPropertySymbol: setterDeprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.isEmpty hasStableParameterNames: false isExtension: false @@ -117,6 +113,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [] visibility: Public @@ -124,9 +121,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.codePointAt hasStableParameterNames: false isExtension: false @@ -142,6 +137,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -151,9 +147,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.codePointBefore hasStableParameterNames: false isExtension: false @@ -169,6 +163,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -178,9 +173,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.codePointCount hasStableParameterNames: false isExtension: false @@ -196,6 +189,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -206,9 +200,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.offsetByCodePoints hasStableParameterNames: false isExtension: false @@ -224,6 +216,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -234,9 +227,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.getChars hasStableParameterNames: false isExtension: false @@ -252,6 +243,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -262,9 +254,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.getChars hasStableParameterNames: false isExtension: false @@ -280,6 +270,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -292,11 +283,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = Deprecated in Java) psi: null ] @@ -315,6 +302,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -327,9 +315,7 @@ KtFunctionSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.getBytes hasStableParameterNames: false isExtension: false @@ -345,6 +331,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -354,9 +341,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.getBytes hasStableParameterNames: false isExtension: false @@ -372,6 +357,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -381,9 +367,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.getBytes hasStableParameterNames: false isExtension: false @@ -399,6 +383,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -406,9 +391,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.equals hasStableParameterNames: false isExtension: false @@ -424,6 +407,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -433,9 +417,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.contentEquals hasStableParameterNames: false isExtension: false @@ -451,6 +433,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -460,9 +443,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.contentEquals hasStableParameterNames: false isExtension: false @@ -478,6 +459,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -487,9 +469,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.equalsIgnoreCase hasStableParameterNames: false isExtension: false @@ -505,6 +485,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -514,9 +495,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.compareTo hasStableParameterNames: false isExtension: false @@ -532,6 +511,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -541,9 +521,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.compareToIgnoreCase hasStableParameterNames: false isExtension: false @@ -559,6 +537,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -568,9 +547,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.regionMatches hasStableParameterNames: false isExtension: false @@ -586,6 +563,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -598,9 +576,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.regionMatches hasStableParameterNames: false isExtension: false @@ -616,6 +592,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -629,9 +606,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.startsWith hasStableParameterNames: false isExtension: false @@ -647,6 +622,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -657,9 +633,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.startsWith hasStableParameterNames: false isExtension: false @@ -675,6 +649,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -684,9 +659,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.endsWith hasStableParameterNames: false isExtension: false @@ -702,6 +675,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -711,9 +685,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.hashCode hasStableParameterNames: false isExtension: false @@ -729,6 +701,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -736,9 +709,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.indexOf hasStableParameterNames: false isExtension: false @@ -754,6 +725,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -763,9 +735,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.indexOf hasStableParameterNames: false isExtension: false @@ -781,6 +751,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -791,9 +762,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.indexOf hasStableParameterNames: false isExtension: false @@ -809,6 +778,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -818,9 +788,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.indexOf hasStableParameterNames: false isExtension: false @@ -836,6 +804,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -846,9 +815,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.indexOfSupplementary hasStableParameterNames: false isExtension: false @@ -864,6 +831,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -874,9 +842,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.lastIndexOf hasStableParameterNames: false isExtension: false @@ -892,6 +858,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -901,9 +868,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.lastIndexOf hasStableParameterNames: false isExtension: false @@ -919,6 +884,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -929,9 +895,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.lastIndexOf hasStableParameterNames: false isExtension: false @@ -947,6 +911,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -956,9 +921,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.lastIndexOf hasStableParameterNames: false isExtension: false @@ -974,6 +937,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -984,9 +948,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.lastIndexOfSupplementary hasStableParameterNames: false isExtension: false @@ -1002,6 +964,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1012,9 +975,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.substring hasStableParameterNames: false isExtension: false @@ -1030,6 +991,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1039,9 +1001,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.substring hasStableParameterNames: false isExtension: false @@ -1057,6 +1017,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1067,9 +1028,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] @EnhancedNullability kotlin/CharSequence - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.subSequence hasStableParameterNames: false isExtension: false @@ -1085,6 +1044,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: @EnhancedNullability kotlin/CharSequence typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1095,9 +1055,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.concat hasStableParameterNames: false isExtension: false @@ -1113,6 +1071,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1122,9 +1081,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.replace hasStableParameterNames: false isExtension: false @@ -1140,6 +1097,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1150,9 +1108,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.replace hasStableParameterNames: false isExtension: false @@ -1168,6 +1124,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1178,9 +1135,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.matches hasStableParameterNames: false isExtension: false @@ -1196,6 +1151,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1205,9 +1161,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.contains hasStableParameterNames: false isExtension: false @@ -1223,6 +1177,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1232,9 +1187,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.replaceFirst hasStableParameterNames: false isExtension: false @@ -1250,6 +1203,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1260,9 +1214,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.replaceAll hasStableParameterNames: false isExtension: false @@ -1278,6 +1230,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1288,9 +1241,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft>, kotlin/Array>?> - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.split hasStableParameterNames: false isExtension: false @@ -1306,6 +1257,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft>, kotlin/Array>?> typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1316,9 +1268,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft>, kotlin/Array>?> - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.split hasStableParameterNames: false isExtension: false @@ -1334,6 +1284,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft>, kotlin/Array>?> typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1343,9 +1294,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toLowerCase hasStableParameterNames: false isExtension: false @@ -1361,6 +1310,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1370,9 +1320,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toLowerCase hasStableParameterNames: false isExtension: false @@ -1388,6 +1336,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -1395,9 +1344,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toUpperCase hasStableParameterNames: false isExtension: false @@ -1413,6 +1360,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1422,9 +1370,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toUpperCase hasStableParameterNames: false isExtension: false @@ -1440,6 +1386,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -1447,9 +1394,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.trim hasStableParameterNames: false isExtension: false @@ -1465,6 +1410,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -1472,9 +1418,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] @EnhancedNullability kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toString hasStableParameterNames: false isExtension: false @@ -1490,6 +1434,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: @EnhancedNullability kotlin/String typeParameters: [] valueParameters: [] visibility: Public @@ -1497,9 +1442,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.toCharArray hasStableParameterNames: false isExtension: false @@ -1515,6 +1458,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -1522,9 +1466,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] ft - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.intern hasStableParameterNames: false isExtension: false @@ -1540,6 +1482,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: ft typeParameters: [] valueParameters: [] visibility: Public @@ -1547,9 +1490,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Char - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: java/lang/String.get hasStableParameterNames: false isExtension: false @@ -1565,6 +1506,7 @@ KtFunctionSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Char typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1574,8 +1516,7 @@ KtFunctionSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: java/lang/String.CaseInsensitiveComparator classKind: CLASS companionObject: null @@ -1588,9 +1529,9 @@ KtNamedClassOrObjectSymbol: name: CaseInsensitiveComparator origin: JAVA superTypes: [ - [] kotlin/Any - [] java/util/Comparator> - [] java/io/Serializable + kotlin/Any + java/util/Comparator> + java/io/Serializable ] symbolKind: CLASS_MEMBER typeParameters: [] @@ -1598,9 +1539,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1609,15 +1548,14 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1626,6 +1564,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1634,9 +1573,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1645,6 +1582,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1653,9 +1591,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1664,6 +1600,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1674,9 +1611,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1685,6 +1620,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1695,11 +1631,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = Deprecated in Java) psi: null ] @@ -1711,6 +1643,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1722,11 +1655,7 @@ KtConstructorSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = Deprecated in Java) psi: null ] @@ -1738,6 +1667,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1747,9 +1677,7 @@ KtConstructorSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java) KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1758,6 +1686,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1769,9 +1698,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1780,6 +1707,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1791,9 +1719,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1802,6 +1728,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1811,9 +1738,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1822,6 +1747,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1831,9 +1757,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1842,6 +1766,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1852,9 +1777,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1863,6 +1786,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1871,9 +1795,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1882,6 +1804,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1890,9 +1813,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1901,6 +1822,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1909,9 +1831,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String hasStableParameterNames: false @@ -1920,6 +1840,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) @@ -1929,11 +1850,7 @@ KtConstructorSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] java/lang/String - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = Deprecated in Java) psi: null ] @@ -1945,6 +1862,7 @@ KtConstructorSymbol: origin: JAVA receiverType: null symbolKind: CLASS_MEMBER + type: java/lang/String typeParameters: [] valueParameters: [ KtValueParameterSymbol(p0) diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt index 5b488f4d261..8b48a945173 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] R - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Function2.invoke hasStableParameterNames: false isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: R typeParameters: [] valueParameters: [ KtValueParameterSymbol(p1) @@ -27,9 +26,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.equals hasStableParameterNames: true isExtension: false @@ -45,6 +42,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -54,9 +52,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.hashCode hasStableParameterNames: true isExtension: false @@ -72,6 +68,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -79,9 +76,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.toString hasStableParameterNames: true isExtension: false @@ -97,8 +92,9 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): kotlin/Any - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt index af8260bae58..3b250d0f3a8 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [ KtTypeParameterSymbol(TT1) KtTypeParameterSymbol(TT2) @@ -30,9 +29,7 @@ KtFunctionSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] test/Foo? - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds getter: null hasBackingField: false @@ -50,9 +47,10 @@ KtKotlinPropertySymbol: modality: OPEN name: propWithOuterAndOwnGenericsAndBounds origin: SOURCE - receiverType: [] test/TwoParams + receiverType: test/TwoParams setter: null symbolKind: CLASS_MEMBER + type: test/Foo? typeParameters: [ KtTypeParameterSymbol(TT1) KtTypeParameterSymbol(TT2) @@ -66,9 +64,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Boolean - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.equals hasStableParameterNames: true isExtension: false @@ -84,6 +80,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Boolean typeParameters: [] valueParameters: [ KtValueParameterSymbol(other) @@ -93,9 +90,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.hashCode hasStableParameterNames: true isExtension: false @@ -111,6 +106,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -118,9 +114,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/Any.toString hasStableParameterNames: true isExtension: false @@ -136,6 +130,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] valueParameters: [] visibility: Public @@ -143,9 +138,7 @@ KtFunctionSymbol: deprecationStatus: null KtConstructorSymbol: - annotatedType: [] test/MyClass - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: test/MyClass hasStableParameterNames: true @@ -154,7 +147,8 @@ KtConstructorSymbol: origin: SOURCE_MEMBER_GENERATED receiverType: null symbolKind: CLASS_MEMBER + type: test/MyClass typeParameters: [] valueParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt index 32822e61a79..9a9941ddfb5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/class.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: kotlin/Lazy classKind: INTERFACE companionObject: null @@ -13,11 +12,11 @@ KtNamedClassOrObjectSymbol: name: Lazy origin: LIBRARY superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [ KtTypeParameterSymbol(T) ] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt index aed2a32ca5d..4d5ed01f43e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: java/lang/String classKind: CLASS companionObject: null @@ -13,12 +12,12 @@ KtNamedClassOrObjectSymbol: name: String origin: JAVA superTypes: [ - [] kotlin/Any - [] java/io/Serializable - [] kotlin/Comparable> - [] kotlin/CharSequence + kotlin/Any + java/io/Serializable + kotlin/Comparable> + kotlin/CharSequence ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt index f67745522ff..324e86b7717 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt @@ -1,5 +1,4 @@ KtEnumEntrySymbol: - annotatedType: [] kotlin/LazyThreadSafetyMode callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode isExtension: false @@ -7,4 +6,5 @@ KtEnumEntrySymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER - deprecationStatus: null + type: kotlin/LazyThreadSafetyMode + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt index 55b5a333aca..d0172c4ae0a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/collections/List - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/listOf hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: TOP_LEVEL + type: kotlin/collections/List typeParameters: [ KtTypeParameterSymbol(T) ] @@ -27,11 +26,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/List - annotationClassIds: [ - kotlin/internal/InlineOnly - ] - annotations: [ + annotationsList: [ kotlin/internal/InlineOnly() psi: null ] @@ -50,6 +45,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: TOP_LEVEL + type: kotlin/collections/List typeParameters: [ KtTypeParameterSymbol(T) ] @@ -58,9 +54,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/List - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/listOf hasStableParameterNames: true isExtension: false @@ -76,6 +70,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: TOP_LEVEL + type: kotlin/collections/List typeParameters: [ KtTypeParameterSymbol(T) ] diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt index 26b52562c22..45829bc4906 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/iterator.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: kotlin/collections/Iterator classKind: INTERFACE companionObject: null @@ -13,11 +12,11 @@ KtNamedClassOrObjectSymbol: name: Iterator origin: LIBRARY superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [ KtTypeParameterSymbol(T) ] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt index 1ffc89c842d..c0a5d42e73e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/listOf.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: kotlin/io/FileWalkDirection classKind: ENUM_CLASS companionObject: null @@ -13,9 +12,9 @@ KtNamedClassOrObjectSymbol: name: FileWalkDirection origin: LIBRARY superTypes: [ - [] kotlin/Enum + kotlin/Enum ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt index 51c4638646f..345f8376b16 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] E - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/List.get hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: E typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt index f30ed2d00ca..9c5954405db 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/collections/ListIterator - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/List.listIterator hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/ListIterator typeParameters: [] valueParameters: [] visibility: Public @@ -24,9 +23,7 @@ KtFunctionSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/collections/ListIterator - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: kotlin/collections/List.listIterator hasStableParameterNames: true isExtension: false @@ -42,10 +39,11 @@ KtFunctionSymbol: origin: LIBRARY receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/collections/ListIterator typeParameters: [] valueParameters: [ KtValueParameterSymbol(index) ] visibility: Public getDispatchReceiver(): kotlin/collections/List - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt index 00903dedca8..daa274b94e2 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry classKind: INTERFACE companionObject: null @@ -13,7 +12,7 @@ KtNamedClassOrObjectSymbol: name: MutableEntry origin: LIBRARY superTypes: [ - [] kotlin/collections/Map.Entry + kotlin/collections/Map.Entry ] symbolKind: CLASS_MEMBER typeParameters: [ @@ -21,4 +20,4 @@ KtNamedClassOrObjectSymbol: KtTypeParameterSymbol(V) ] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index d6cfe102319..a29f9a6e42f 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -1,7 +1,5 @@ KtValueParameterSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -10,12 +8,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/String deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -24,12 +21,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtConstructorSymbol: - annotatedType: [] Anno - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: Anno hasStableParameterNames: true @@ -38,6 +34,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: Anno typeParameters: [] valueParameters: [ KtValueParameterSymbol(param1) @@ -47,8 +44,7 @@ KtConstructorSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Anno classKind: ANNOTATION_CLASS companionObject: null @@ -61,7 +57,7 @@ KtNamedClassOrObjectSymbol: name: Anno origin: SOURCE superTypes: [ - [] kotlin/Annotation + kotlin/Annotation ] symbolKind: TOP_LEVEL typeParameters: [] @@ -69,11 +65,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [ - Anno - ] - annotations: [ + annotationsList: [ Anno(param1 = funparam, param2 = 3) psi: KtAnnotationEntry ] @@ -92,6 +84,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public @@ -99,10 +92,7 @@ KtFunctionSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [ - Anno - ] - annotations: [ + annotationsList: [ Anno(param1 = param, param2 = 2) psi: KtAnnotationEntry ] @@ -118,9 +108,9 @@ KtNamedClassOrObjectSymbol: name: X origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt index 698baaa0644..d1755ee116a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public @@ -24,9 +23,7 @@ KtFunctionSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null getter: KtPropertyGetterSymbol() hasBackingField: true @@ -47,6 +44,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): @@ -57,22 +55,19 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtAnonymousObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: null classKind: ANONYMOUS_OBJECT name: null origin: SOURCE superTypes: [ - [] java/lang/Runnable + java/lang/Runnable ] symbolKind: LOCAL deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] java/lang/Runnable - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /AnonymousContainer.anonymousObject getter: KtPropertyGetterSymbol() hasBackingField: true @@ -93,6 +88,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: java/lang/Runnable typeParameters: [] visibility: Public getDispatchReceiver(): AnonymousContainer @@ -103,8 +99,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: AnonymousContainer classKind: CLASS companionObject: null @@ -117,9 +112,9 @@ KtNamedClassOrObjectSymbol: name: AnonymousContainer origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt index c29f5ba4175..009b1065c44 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt @@ -1,7 +1,5 @@ KtFunctionSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false @@ -17,6 +15,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Unit typeParameters: [] valueParameters: [] visibility: Public @@ -24,9 +23,7 @@ KtFunctionSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null getter: KtPropertyGetterSymbol() hasBackingField: true @@ -47,6 +44,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): @@ -57,22 +55,19 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtAnonymousObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: null classKind: ANONYMOUS_OBJECT name: null origin: SOURCE superTypes: [ - [] java/lang/Runnable + java/lang/Runnable ] symbolKind: LOCAL deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] java/lang/Runnable - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /AnonymousContainer.anonymousObject getter: KtPropertyGetterSymbol() hasBackingField: true @@ -93,6 +88,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: java/lang/Runnable typeParameters: [] visibility: Public getDispatchReceiver(): AnonymousContainer @@ -103,8 +99,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: AnonymousContainer classKind: CLASS companionObject: null @@ -117,9 +112,9 @@ KtNamedClassOrObjectSymbol: name: AnonymousContainer origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index d15c67447f8..d86a30ef3e7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt @@ -1,7 +1,5 @@ KtPropertyGetterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasBody: true hasStableParameterNames: true @@ -13,14 +11,13 @@ KtPropertyGetterSymbol: origin: SOURCE receiverType: null symbolKind: ACCESSOR + type: kotlin/Int valueParameters: [] visibility: Public deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -29,12 +26,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtPropertySetterSymbol: - annotatedType: [] kotlin/Unit - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasBody: true hasStableParameterNames: true @@ -47,6 +43,7 @@ KtPropertySetterSymbol: parameter: KtValueParameterSymbol(value) receiverType: null symbolKind: ACCESSOR + type: kotlin/Unit valueParameters: [ KtValueParameterSymbol(value) ] @@ -54,9 +51,7 @@ KtPropertySetterSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /p getter: KtPropertyGetterSymbol() hasBackingField: true @@ -77,10 +72,11 @@ KtKotlinPropertySymbol: receiverType: null setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null getterDeprecationStatus: null javaGetterName: getP javaSetterName: setP - setterDeprecationStatus: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt index b4ff8159dc2..e37838305d1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/class.txt @@ -1,6 +1,5 @@ KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -13,9 +12,9 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt index db512dd43c0..0e4d2b57124 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt @@ -1,7 +1,5 @@ KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /A.i getter: KtPropertyGetterSymbol() hasBackingField: true @@ -22,6 +20,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): A @@ -37,8 +36,7 @@ KtClassInitializerSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -51,9 +49,9 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt index 22c96f4cd8b..0a21ca13ec5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt @@ -1,7 +1,5 @@ KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /A.a getter: KtPropertyGetterSymbol() hasBackingField: true @@ -22,6 +20,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): A @@ -32,9 +31,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /A.x hasStableParameterNames: true isExtension: false @@ -50,6 +47,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -57,8 +55,7 @@ KtFunctionSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -71,9 +68,9 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index ed393a2e8eb..52d1e6160fe 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -1,7 +1,5 @@ KtConstructorSymbol: - annotatedType: [] A - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: A hasStableParameterNames: true @@ -10,14 +8,14 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: A typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -30,9 +28,9 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index 3b67e2e8057..07a35c601c6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -1,7 +1,5 @@ KtConstructorSymbol: - annotatedType: [] A - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: A hasStableParameterNames: true @@ -10,15 +8,14 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: A typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -27,12 +24,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtConstructorSymbol: - annotatedType: [] A - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: A hasStableParameterNames: true @@ -41,6 +37,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: A typeParameters: [] valueParameters: [ KtValueParameterSymbol(x) @@ -49,9 +46,7 @@ KtConstructorSymbol: deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -60,12 +55,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -74,12 +68,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/String deprecationStatus: null KtConstructorSymbol: - annotatedType: [] A - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: A hasStableParameterNames: true @@ -88,6 +81,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: A typeParameters: [] valueParameters: [ KtValueParameterSymbol(y) @@ -97,8 +91,7 @@ KtConstructorSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -111,9 +104,9 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt index da22cec261f..611739a9154 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt @@ -19,8 +19,7 @@ KtTypeParameterSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: A classKind: CLASS companionObject: null @@ -33,7 +32,7 @@ KtNamedClassOrObjectSymbol: name: A origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [ @@ -41,4 +40,4 @@ KtNamedClassOrObjectSymbol: KtTypeParameterSymbol(R) ] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt index 095013ddf5a..7898591fb5d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt @@ -1,7 +1,5 @@ KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -10,12 +8,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -24,12 +21,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -38,12 +34,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtConstructorSymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: MyColor hasStableParameterNames: true @@ -52,6 +47,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] valueParameters: [ KtValueParameterSymbol(x) @@ -62,8 +58,7 @@ KtConstructorSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: MyColor classKind: CLASS companionObject: null @@ -76,7 +71,7 @@ KtNamedClassOrObjectSymbol: name: MyColor origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -84,20 +79,18 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtAnonymousFunctionSymbol: - annotatedType: [] MyColor callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false origin: SOURCE receiverType: null symbolKind: LOCAL + type: MyColor valueParameters: [] deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.delegate getter: KtPropertyGetterSymbol() hasBackingField: false @@ -118,6 +111,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -128,20 +122,18 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtAnonymousFunctionSymbol: - annotatedType: [] MyColor callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false origin: SOURCE receiverType: null symbolKind: LOCAL + type: MyColor valueParameters: [] deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Lazy - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.lambda getter: KtPropertyGetterSymbol() hasBackingField: true @@ -162,6 +154,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Lazy typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -172,9 +165,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.nonLazy getter: KtPropertyGetterSymbol() hasBackingField: true @@ -195,6 +186,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -205,8 +197,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Some classKind: CLASS companionObject: null @@ -219,9 +210,9 @@ KtNamedClassOrObjectSymbol: name: Some origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt index 9c37e977d62..578b91f5475 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt @@ -1,7 +1,5 @@ KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -10,12 +8,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -24,12 +21,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtValueParameterSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -38,12 +34,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/Int deprecationStatus: null KtConstructorSymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: MyColor hasStableParameterNames: true @@ -52,6 +47,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] valueParameters: [ KtValueParameterSymbol(x) @@ -62,8 +58,7 @@ KtConstructorSymbol: deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: MyColor classKind: CLASS companionObject: null @@ -76,7 +71,7 @@ KtNamedClassOrObjectSymbol: name: MyColor origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -84,20 +79,18 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtAnonymousFunctionSymbol: - annotatedType: [] MyColor callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false origin: SOURCE receiverType: null symbolKind: LOCAL + type: MyColor valueParameters: [] deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.delegate getter: KtPropertyGetterSymbol() hasBackingField: false @@ -118,6 +111,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -128,20 +122,18 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtAnonymousFunctionSymbol: - annotatedType: [] MyColor callableIdIfNonLocal: null hasStableParameterNames: true isExtension: false origin: SOURCE receiverType: null symbolKind: LOCAL + type: MyColor valueParameters: [] deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Lazy - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.lambda getter: KtPropertyGetterSymbol() hasBackingField: true @@ -162,6 +154,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Lazy typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -172,9 +165,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] MyColor - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Some.nonLazy getter: KtPropertyGetterSymbol() hasBackingField: true @@ -195,6 +186,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: MyColor typeParameters: [] visibility: Public getDispatchReceiver(): Some @@ -205,8 +197,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Some classKind: CLASS companionObject: null @@ -219,9 +210,9 @@ KtNamedClassOrObjectSymbol: name: Some origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt index 6cb5703bcad..ddd440b8c34 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt @@ -1,9 +1,5 @@ KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use i) psi: KtAnnotationEntry ] @@ -27,6 +23,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i) @@ -36,9 +33,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i2 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -59,6 +54,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -68,9 +64,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i3 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -91,6 +85,7 @@ KtKotlinPropertySymbol: receiverType: null setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -100,9 +95,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i4 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -123,6 +116,7 @@ KtKotlinPropertySymbol: receiverType: null setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -132,11 +126,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4) KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use f) psi: KtAnnotationEntry ] @@ -155,16 +145,14 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f) KtNamedClassOrObjectSymbol: - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use MyClass) psi: KtAnnotationEntry ] @@ -180,7 +168,7 @@ KtNamedClassOrObjectSymbol: name: MyClass origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -188,11 +176,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use i2) psi: KtAnnotationEntry ] @@ -216,6 +200,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): Foo @@ -226,11 +211,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2) KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use f2) psi: KtAnnotationEntry ] @@ -249,6 +230,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -256,8 +238,7 @@ KtFunctionSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2) KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Foo classKind: CLASS companionObject: null @@ -270,7 +251,7 @@ KtNamedClassOrObjectSymbol: name: Foo origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -278,11 +259,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j) psi: KtAnnotationEntry ] @@ -306,6 +283,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=don't use j) @@ -315,11 +293,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=don't use j) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2) psi: KtAnnotationEntry ] @@ -343,6 +317,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=don't use j2) @@ -352,9 +327,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=don't use j2) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /j2 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -375,6 +348,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt index d4c4d9a863e..8aba5cd0602 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt @@ -1,9 +1,5 @@ KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use i) psi: KtAnnotationEntry ] @@ -27,6 +23,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i) @@ -36,9 +33,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i2 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -59,6 +54,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -68,9 +64,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i3 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -91,6 +85,7 @@ KtKotlinPropertySymbol: receiverType: null setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -100,9 +95,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /i4 getter: KtPropertyGetterSymbol() hasBackingField: true @@ -123,6 +116,7 @@ KtKotlinPropertySymbol: receiverType: null setter: KtPropertySetterSymbol() symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: null @@ -132,11 +126,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4) KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use f) psi: KtAnnotationEntry ] @@ -155,16 +145,14 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f) KtNamedClassOrObjectSymbol: - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use MyClass) psi: KtAnnotationEntry ] @@ -180,7 +168,7 @@ KtNamedClassOrObjectSymbol: name: MyClass origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -188,11 +176,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use i2) psi: KtAnnotationEntry ] @@ -216,6 +200,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] visibility: Public getDispatchReceiver(): Foo @@ -226,11 +211,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2) KtFunctionSymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(message = don't use f2) psi: KtAnnotationEntry ] @@ -249,6 +230,7 @@ KtFunctionSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: kotlin/Int typeParameters: [] valueParameters: [] visibility: Public @@ -256,8 +238,7 @@ KtFunctionSymbol: deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2) KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Foo classKind: CLASS companionObject: null @@ -270,7 +251,7 @@ KtNamedClassOrObjectSymbol: name: Foo origin: SOURCE superTypes: [ - [] kotlin/Any + kotlin/Any ] symbolKind: TOP_LEVEL typeParameters: [] @@ -278,11 +259,7 @@ KtNamedClassOrObjectSymbol: deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j) psi: KtAnnotationEntry ] @@ -306,6 +283,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null) @@ -315,11 +293,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - kotlin/Deprecated - ] - annotations: [ + annotationsList: [ kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2) psi: KtAnnotationEntry ] @@ -343,6 +317,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null) @@ -352,11 +327,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null) KtKotlinPropertySymbol: - annotatedType: [] kotlin/Int - annotationClassIds: [ - java/lang/Deprecated - ] - annotations: [ + annotationsList: [ java/lang/Deprecated() psi: KtAnnotationEntry ] @@ -380,6 +351,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL + type: kotlin/Int typeParameters: [] visibility: Public deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt index 96dc826625c..ea478beb305 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt @@ -1,5 +1,4 @@ KtEnumEntrySymbol: - annotatedType: [] X callableIdIfNonLocal: /X.Y containingEnumClassIdIfNonLocal: X isExtension: false @@ -7,10 +6,10 @@ KtEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: X deprecationStatus: null KtEnumEntrySymbol: - annotatedType: [] X callableIdIfNonLocal: /X.Z containingEnumClassIdIfNonLocal: X isExtension: false @@ -18,11 +17,11 @@ KtEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: X deprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: X classKind: ENUM_CLASS companionObject: null @@ -35,9 +34,9 @@ KtNamedClassOrObjectSymbol: name: X origin: SOURCE superTypes: [ - [] kotlin/Enum + kotlin/Enum ] symbolKind: TOP_LEVEL typeParameters: [] visibility: Public - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index fde4684d3f9..5775f8ab593 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -1,7 +1,5 @@ KtValueParameterSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasDefaultValue: false isExtension: false @@ -10,12 +8,11 @@ KtValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + type: kotlin/String deprecationStatus: null KtConstructorSymbol: - annotatedType: [] Style - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null containingClassIdIfNonLocal: Style hasStableParameterNames: true @@ -24,6 +21,7 @@ KtConstructorSymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: Style typeParameters: [] valueParameters: [ KtValueParameterSymbol(value) @@ -32,9 +30,7 @@ KtConstructorSymbol: deprecationStatus: null KtPropertyGetterSymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null hasBody: true hasStableParameterNames: true @@ -46,15 +42,14 @@ KtPropertyGetterSymbol: origin: SOURCE receiverType: null symbolKind: ACCESSOR + type: kotlin/String valueParameters: [] visibility: Public getDispatchReceiver(): Style.SHEET deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: null getter: KtPropertyGetterSymbol() hasBackingField: false @@ -75,6 +70,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] visibility: Public getDispatchReceiver(): Style.SHEET @@ -85,7 +81,6 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtEnumEntrySymbol: - annotatedType: [] Style callableIdIfNonLocal: /Style.SHEET containingEnumClassIdIfNonLocal: Style isExtension: false @@ -93,12 +88,11 @@ KtEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: CLASS_MEMBER + type: Style deprecationStatus: null KtKotlinPropertySymbol: - annotatedType: [] kotlin/String - annotationClassIds: [] - annotations: [] + annotationsList: [] callableIdIfNonLocal: /Style.exitAnimation getter: KtPropertyGetterSymbol() hasBackingField: false @@ -119,6 +113,7 @@ KtKotlinPropertySymbol: receiverType: null setter: null symbolKind: CLASS_MEMBER + type: kotlin/String typeParameters: [] visibility: Public getDispatchReceiver(): Style @@ -129,8 +124,7 @@ KtKotlinPropertySymbol: setterDeprecationStatus: null KtNamedClassOrObjectSymbol: - annotationClassIds: [] - annotations: [] + annotationsList: [] classIdIfNonLocal: Style classKind: ENUM_CLASS companionObject: null @@ -143,9 +137,9 @@ KtNamedClassOrObjectSymbol: name: Style origin: SOURCE superTypes: [ - [] kotlin/Enum