From 6bf1cefba67eba40dc609f057d1af4fcfb91933b Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 17 Oct 2022 15:17:33 +0200 Subject: [PATCH] [AA] do not render redundant declarations for AbstractSymbolByPsiTest ^KT-54311 --- .../cases/symbols/AbstractSymbolByPsiTest.kt | 21 +- .../symbols/AbstractSymbolByReferenceTest.kt | 1 - .../symbolByPsi/annotations.descriptors.txt | 124 ------------ .../symbols/symbolByPsi/annotations.txt | 124 ------------ .../symbols/symbolByPsi/backingField.txt | 97 --------- .../classPrimaryConstructor.descriptors.txt | 82 -------- .../symbolByPsi/classPrimaryConstructor.txt | 82 -------- .../classSecondaryConstructors.txt | 60 ------ .../contextReceiversOnClass.txt | 20 -- .../contextReceiversOnProperty.txt | 21 -- .../symbolByPsi/delegateField.descriptors.txt | 186 ------------------ .../symbols/symbolByPsi/delegateField.txt | 186 ------------------ .../destructuringDeclaration.descriptors.txt | 124 ------------ .../symbolByPsi/destructuringDeclaration.txt | 124 ------------ .../testData/symbols/symbolByPsi/dynamic.txt | 20 -- .../enumValueMember.descriptors.txt | 84 -------- .../symbols/symbolByPsi/enumValueMember.txt | 83 -------- .../symbolByPsi/explicitBackingField.txt | 97 --------- .../testData/symbols/symbolByPsi/function.txt | 20 -- .../symbolByPsi/functionWithTypeParams.txt | 20 -- .../implicitConstructorDelegationCall.txt | 20 -- .../symbolByPsi/implicitReturnInLambda.txt | 60 ------ .../symbolByPsi/jvmName.descriptors.txt | 105 ---------- .../testData/symbols/symbolByPsi/jvmName.txt | 103 ---------- .../memberProperties.descriptors.txt | 146 -------------- .../symbols/symbolByPsi/memberProperties.txt | 21 -- .../symbolByPsi/topLevelProperties.txt | 118 ----------- .../typeAnnotations.descriptors.txt | 23 --- .../symbols/symbolByPsi/typeAnnotations.txt | 23 --- .../valueParameters/parameterInlining.txt | 60 ------ .../symbols/symbolByPsi/varargFunctions.txt | 80 -------- 31 files changed, 9 insertions(+), 2326 deletions(-) delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByPsiTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByPsiTest.kt index 022f2586f41..6ae1df46f0e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByPsiTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByPsiTest.kt @@ -6,11 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.psi.KtBackingField -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtDestructuringDeclaration -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtParameter +import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType import org.jetbrains.kotlin.test.services.TestServices @@ -21,6 +17,7 @@ abstract class AbstractSymbolByPsiTest : AbstractSymbolTest() { val allDeclarationSymbols = ktFile.collectDescendantsOfType { it.isValidForSymbolCreation }.map { declaration -> declaration.getSymbol() } + return SymbolsData( allDeclarationSymbols, listOf(ktFile.getFileSymbol()), @@ -28,11 +25,11 @@ abstract class AbstractSymbolByPsiTest : AbstractSymbolTest() { } private val KtDeclaration.isValidForSymbolCreation - get() = - when (this) { - is KtBackingField -> false - is KtDestructuringDeclaration -> false - is KtParameter -> !this.isFunctionTypeParameter - else -> true - } + get() = when (this) { + is KtBackingField -> false + is KtDestructuringDeclaration -> false + is KtPropertyAccessor -> false + is KtParameter -> !this.isFunctionTypeParameter && this.parent !is KtParameterList + else -> true + } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByReferenceTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByReferenceTest.kt index 3a982bb5de1..5e33f88dda7 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByReferenceTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolByReferenceTest.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtReferenceExpression import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt index 39bc4c5e507..f55d661fa1f 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt @@ -1,127 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Anno.param1 - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: param1 - origin: SOURCE - receiverType: null - returnType: kotlin/String - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: param1 - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Anno.param2 - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: param2 - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: param2 - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index f5dcffcaa98..fef688cfe5c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -1,127 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Anno.param1 - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val param1: String) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: param1 - origin: SOURCE - receiverType: null - returnType: kotlin/String - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: param1 - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Anno.param2 - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val param2: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: param2 - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: param2 - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index d1b1d6b54c5..ca9d6b57692 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt @@ -1,100 +1,3 @@ -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertySetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - receiverType: null - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /p diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt index 520b80c3606..70fe88e590f 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt @@ -1,85 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.a - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: b - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index b64d9db355b..b3457dab8aa 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -1,85 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.a - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val a: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: b - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index 323bdbe80f8..6d91b9807e1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -16,26 +16,6 @@ KtConstructorSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null @@ -72,46 +52,6 @@ KtConstructorSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: z - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt index f1c5f050a75..5b253c7e786 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.txt @@ -1,23 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: int - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt index f271c487e86..52d5fffcd65 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt @@ -1,24 +1,3 @@ -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /y diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt index ade761173eb..a7002da1111 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt @@ -1,189 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.x - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.y - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.z - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: z - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: z - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt index 8e5c9235e37..3b9d2a2bdd9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt @@ -1,189 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.x - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val x: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.y - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val y: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /MyColor.z - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val z: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: z - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: z - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt index a96c4f5b104..68a60d40072 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt @@ -1,127 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /P.x - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /P.y - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt index 6a6bd791335..d18af0be673 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt @@ -1,127 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /P.x - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val x: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /P.y - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val y: Int) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: y - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt index 625966b45d8..defd4db24f5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt @@ -49,26 +49,6 @@ KtKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: p - origin: SOURCE - receiverType: null - returnType: dynamic - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtAnonymousFunctionSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index 491985295cc..42428978d26 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -1,65 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Style.value - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/String - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null @@ -138,28 +76,6 @@ KtConstructorSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: true - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getDispatchReceiver(): Style.SHEET - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt index a5c484ecec9..2b6164a8e10 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt @@ -1,65 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /Style.value - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtNonConstantInitializerValue(val value: String) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: true - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/String - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null @@ -138,27 +76,6 @@ KtConstructorSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: true - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/String - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt index d1b1d6b54c5..ca9d6b57692 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt @@ -1,100 +1,3 @@ -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertySetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - receiverType: null - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /p diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt index 00b8c04a9bc..d73a6b41b73 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt @@ -1,23 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /foo diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt index a4e0b463ebe..b2c43788b02 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -11,26 +11,6 @@ KtTypeParameterSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: x - origin: SOURCE - receiverType: null - returnType: X - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /foo diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index f0a87fb78a9..d5db0799c33 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -1,23 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: i - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtConstructorSymbol: annotationsList: [] callableIdIfNonLocal: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt index 0001bdb0b38..aea1d5c4bd6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt @@ -1,23 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtLocalVariableSymbol: annotationsList: [] callableIdIfNonLocal: null @@ -81,26 +61,6 @@ KtLocalVariableSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtLocalVariableSymbol: annotationsList: [] callableIdIfNonLocal: null @@ -238,26 +198,6 @@ KtFunctionSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: lmbd - origin: SOURCE - receiverType: null - returnType: kotlin/Function1 - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /bar diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt index f3eb215d5d6..153c357262d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt @@ -107,111 +107,6 @@ KtKotlinPropertySymbol: javaSetterName: setMyI setterDeprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [ - kotlin/jvm/JvmName(name = "getMyJ") - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getDispatchReceiver(): Foo - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertySetterSymbol: - annotationsList: [ - kotlin/jvm/JvmName(name = "setMyJ") - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - receiverType: null - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getDispatchReceiver(): Foo - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /Foo.j diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index 517b630bb52..a18c287017a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -107,109 +107,6 @@ KtKotlinPropertySymbol: javaSetterName: setMyI setterDeprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [ - kotlin/jvm/JvmName(name = "getMyJ") - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertySetterSymbol: - annotationsList: [ - kotlin/jvm/JvmName(name = "setMyJ") - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - receiverType: null - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /Foo.j diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt deleted file mode 100644 index 7b5ffce49b4..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt +++ /dev/null @@ -1,146 +0,0 @@ -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.x - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: true - hasGetter: true - hasSetter: false - initializer: KtConstantInitializerValue(10) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: x - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getX - javaSetterName: null - setterDeprecationStatus: null - -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: kotlin/Int - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /A.y - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: kotlin/Int - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - hasBackingField: false - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: false - isExtension: true - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: y - origin: SOURCE - receiverType: kotlin/Int - returnType: kotlin/Int - setter: null - symbolKind: CLASS_MEMBER - typeParameters: [] - visibility: Public - getDispatchReceiver(): A - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getY - javaSetterName: null - setterDeprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: A - classKind: CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: A - origin: SOURCE - superTypes: [ - kotlin/Any - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index f225ff77afe..4577a5b2755 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -49,27 +49,6 @@ KtKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: kotlin/Int - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /A.y diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt index 25c42913153..b24f47f32fd 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt @@ -48,27 +48,6 @@ KtKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: kotlin/Int - returnType: kotlin/Int - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /y @@ -119,103 +98,6 @@ KtKotlinPropertySymbol: javaSetterName: null setterDeprecationStatus: null -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: kotlin/Short - returnType: kotlin/Long - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Long - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertySetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Long - symbolKind: LOCAL - typeParameters: [] - receiverType: kotlin/Short - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: value - origin: SOURCE - receiverType: null - returnType: kotlin/Long - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtKotlinPropertySymbol: annotationsList: [] callableIdIfNonLocal: /get diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt index ec2a0b94b86..f2ef994d6b8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt @@ -125,29 +125,6 @@ KtNamedClassOrObjectSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: arg - origin: SOURCE - receiverType: null - returnType: [ - Anno2() - psi: KtAnnotationEntry - ] @R|Anno2|() I - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /X.f diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt index 448b41ee92f..0963c04fb91 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -125,29 +125,6 @@ KtNamedClassOrObjectSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: arg - origin: SOURCE - receiverType: null - returnType: [ - Anno2() - psi: KtAnnotationEntry - ] @R|Anno2|() I - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /X.f diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt index 6329f6101c4..d54b5e2eb02 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.txt @@ -1,63 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: inlineParameter - origin: SOURCE - receiverType: null - returnType: kotlin/Function0 - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: true - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: crossinlineParameter - origin: SOURCE - receiverType: null - returnType: kotlin/Function0 - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: true - isVararg: false - name: noinlineParameter - origin: SOURCE - receiverType: null - returnType: kotlin/Function0 - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /foo diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt index d61f225f4f4..30cc67434e5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt @@ -1,23 +1,3 @@ -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: true - name: a - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /primitive @@ -62,26 +42,6 @@ KtFunctionSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: true - name: b - origin: SOURCE - receiverType: null - returnType: kotlin/Float? - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /nullablePrimitive @@ -126,26 +86,6 @@ KtFunctionSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: true - name: c - origin: SOURCE - receiverType: null - returnType: kotlin/Any - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /nonPrimitive @@ -190,26 +130,6 @@ KtFunctionSymbol: getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null -KtValueParameterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: true - name: d - origin: SOURCE - receiverType: null - returnType: ERROR_TYPE - symbolKind: LOCAL - typeParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - KtFunctionSymbol: annotationsList: [] callableIdIfNonLocal: /error