From f9087a8ab1e9a33e4299cf2523323cb08ca41043 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 4 May 2021 13:21:26 +0200 Subject: [PATCH] FIR IDE: update testdata after changes in symbols --- .../testData/memberScopeByFqName/Int.kt | 2 + .../memberScopeByFqName/java.lang.String.kt | 40 +++++++++++++++++++ .../symbols/symbolByFqName/enumEntry.kt | 2 + .../symbols/symbolByPsi/annotations.kt | 6 +++ .../symbolByPsi/classPrimaryConstructor.kt | 2 + .../symbolByPsi/classSecondaryConstructors.kt | 12 ++++++ .../testData/symbols/symbolByPsi/enum.kt | 4 ++ .../testData/symbols/symbolByPsi/function.kt | 2 + .../symbolByPsi/functionWithTypeParams.kt | 2 + .../symbols/symbolByPsi/localDeclarations.kt | 2 + .../symbols/symbolByPsi/memberProperties.kt | 2 + .../symbols/symbolByPsi/topLevelProperties.kt | 2 + .../symbols/symbolByPsi/typeAnnotations.kt | 2 + .../symbolByReference/accessorField.kt | 2 + .../constructorViaTypeAlias.kt | 2 + 15 files changed, 84 insertions(+) diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt index af5e73d4a06..87a01aeed80 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt @@ -1312,8 +1312,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: kotlin/Int dispatchType: null + isExtension: false isPrimary: true origin: LIBRARY + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [] diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt index c0af2f9f29d..603a8dd2fae 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt @@ -7,20 +7,24 @@ KtFirJavaFieldSymbol: annotatedType: [] ft callableIdIfNonLocal: java/lang/String.value + isExtension: false isVal: true modality: FINAL name: value origin: JAVA + receiverType: null symbolKind: MEMBER visibility: Private KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash + isExtension: false isVal: false modality: OPEN name: hash origin: JAVA + receiverType: null symbolKind: MEMBER visibility: Private @@ -48,10 +52,12 @@ KtFirFunctionSymbol: KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: java/lang/String.hash32 + isExtension: false isVal: false modality: OPEN name: hash32 origin: JAVA + receiverType: null symbolKind: MEMBER visibility: Private @@ -1260,8 +1266,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [] @@ -1274,8 +1282,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(original)] @@ -1288,8 +1298,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value)] @@ -1302,8 +1314,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] @@ -1316,8 +1330,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(codePoints), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] @@ -1330,8 +1346,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] @@ -1344,8 +1362,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte)] @@ -1358,8 +1378,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charsetName)] @@ -1372,8 +1394,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charset)] @@ -1386,8 +1410,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charsetName)] @@ -1400,8 +1426,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charset)] @@ -1414,8 +1442,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length)] @@ -1428,8 +1458,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes)] @@ -1442,8 +1474,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(buffer)] @@ -1456,8 +1490,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(builder)] @@ -1470,8 +1506,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(share)] @@ -1484,8 +1522,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/lang/String dispatchType: null + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count), KtFirValueParameterSymbol(value)] diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.kt index f570ee49388..7a0d7b8705b 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.kt @@ -8,7 +8,9 @@ KtFirEnumEntrySymbol: annotatedType: [] kotlin/LazyThreadSafetyMode callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode + isExtension: false name: SYNCHRONIZED origin: LIBRARY + receiverType: null symbolKind: MEMBER */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt index 33f929c164f..680d1ff6941 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt @@ -16,9 +16,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: param1 origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirValueParameterSymbol: @@ -27,9 +29,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: param2 origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirConstructorSymbol: @@ -39,8 +43,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: Anno dispatchType: null + isExtension: false isPrimary: true origin: SOURCE + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(param1), KtFirValueParameterSymbol(param2)] diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt index e6acc038580..85a2c82d439 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt @@ -10,8 +10,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: A dispatchType: null + isExtension: false isPrimary: true origin: SOURCE + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [] diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt index 9f8c6bfe241..1c7a9deb056 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt @@ -12,8 +12,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: A dispatchType: null + isExtension: false isPrimary: true origin: SOURCE + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [] @@ -25,9 +27,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: x origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirConstructorSymbol: @@ -37,8 +41,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: A dispatchType: null + isExtension: false isPrimary: false origin: SOURCE + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(x)] @@ -50,9 +56,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: y origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirValueParameterSymbol: @@ -61,9 +69,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: z origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirConstructorSymbol: @@ -73,8 +83,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: A dispatchType: null + isExtension: false isPrimary: false origin: SOURCE + receiverType: null symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(y), KtFirValueParameterSymbol(z)] diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt index 357a8157db1..ad5c5721dc1 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt @@ -8,16 +8,20 @@ KtFirEnumEntrySymbol: annotatedType: [] X callableIdIfNonLocal: /X.Y containingEnumClassIdIfNonLocal: X + isExtension: false name: Y origin: SOURCE + receiverType: null symbolKind: MEMBER KtFirEnumEntrySymbol: annotatedType: [] X callableIdIfNonLocal: /X.Z containingEnumClassIdIfNonLocal: X + isExtension: false name: Z origin: SOURCE + receiverType: null symbolKind: MEMBER KtFirNamedClassOrObjectSymbol: diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt index e90ef629d08..5c59924bc11 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt @@ -8,9 +8,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: x origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirFunctionSymbol: diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt index 2b62374f909..44208681119 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt @@ -15,9 +15,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: x origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirFunctionSymbol: diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt index 727fe4ad574..1dc81158600 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt @@ -10,9 +10,11 @@ fun yyy() { KtFirLocalVariableSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null + isExtension: false isVal: true name: q origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirFunctionSymbol: diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt index 8b6e62ef4d8..e50b8d0aa52 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt @@ -37,10 +37,12 @@ KtFirPropertyGetterSymbol: dispatchType: null hasBody: true isDefault: false + isExtension: false isInline: false isOverride: false modality: FINAL origin: SOURCE + receiverType: null symbolKind: ACCESSOR visibility: Public diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt index 0b651218d83..6868284eae6 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt @@ -35,10 +35,12 @@ KtFirPropertyGetterSymbol: dispatchType: null hasBody: true isDefault: false + isExtension: false isInline: false isOverride: false modality: FINAL origin: SOURCE + receiverType: null symbolKind: ACCESSOR visibility: Public diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt index a48145a9488..f58e034b793 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt @@ -117,9 +117,11 @@ KtFirValueParameterSymbol: annotations: [] callableIdIfNonLocal: null hasDefaultValue: false + isExtension: false isVararg: false name: arg origin: SOURCE + receiverType: null symbolKind: LOCAL KtFirFunctionSymbol: diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.kt b/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.kt index 7eb229d7c48..075d9b73ee6 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.kt @@ -9,8 +9,10 @@ var x: Int = 0 KtFirBackingFieldSymbol: annotatedType: [] kotlin/Int callableIdIfNonLocal: null + isExtension: false name: field origin: PROPERTY_BACKING_FIELD owningProperty: KtFirKotlinPropertySymbol(x) + receiverType: null symbolKind: LOCAL */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt index 4abf1003583..0c55d3caf00 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt @@ -14,8 +14,10 @@ KtFirConstructorSymbol: callableIdIfNonLocal: null containingClassIdIfNonLocal: java/util/ArrayList dispatchType: java/util/ArrayList + isExtension: false isPrimary: false origin: JAVA + receiverType: null symbolKind: MEMBER typeParameters: [KtFirTypeParameterSymbol(E)] valueParameters: [KtFirValueParameterSymbol(c)]