From bb470b550495b9186d8f76494698524ab40ae859 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 7 Sep 2023 17:53:36 +0200 Subject: [PATCH] [Analysis API Fe10] fix isFromPrimaryConstructor --- .../descriptorBased/KtFe10DescKotlinPropertySymbol.kt | 6 +++--- .../symbols/symbolByPsi/annotations.descriptors.txt | 4 ++-- .../symbolByPsi/classPrimaryConstructor.descriptors.txt | 2 +- .../symbols/symbolByPsi/delegateField.descriptors.txt | 6 +++--- .../symbolByPsi/destructuringDeclaration.descriptors.txt | 4 ++-- .../symbols/symbolByPsi/enumValueMember.descriptors.txt | 2 +- .../symbols/symbolByPsi/typeAnnotations.descriptors.txt | 2 +- ...InAnnotationPrimaryConstructorAsProperty.descriptors.txt | 2 +- ...nPrimaryConstructorAsPropertyWithoutType.descriptors.txt | 2 +- .../varargInPrimaryConstructorAsProperty.descriptors.txt | 2 +- ...nPrimaryConstructorAsPropertyWithoutType.descriptors.txt | 2 +- ...PrimaryConstructorAsPropertyWithoutType2.descriptors.txt | 2 +- ...imaryConstructorValueParameterAsProperty.descriptors.txt | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt index fb7f4e25026..8be80e6f86c 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -19,11 +19,11 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -52,7 +52,7 @@ internal class KtFe10DescKotlinPropertySymbol( get() = withValidityAssertion { descriptor.isExtension } override val isFromPrimaryConstructor: Boolean - get() = withValidityAssertion { descriptor.containingDeclaration is ConstructorDescriptor } + get() = withValidityAssertion { psi is KtParameter } override val isStatic: Boolean get() = withValidityAssertion { DescriptorUtils.isEnumEntry(descriptor) } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt index fb8b54bd695..21d17050a03 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false @@ -183,7 +183,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt index c2091301f5f..e6a9c47105c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt index 47d06489040..f3b04d42ff2 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false @@ -183,7 +183,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false @@ -288,7 +288,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt index 9dfff0172d4..5fd951c794c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false @@ -183,7 +183,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index 5b229b494d6..d5464663a36 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt index 7a8832482cd..1a2adbc3e24 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt @@ -206,7 +206,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsProperty.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsProperty.descriptors.txt index 5c61043886e..56d1c04ae0d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsProperty.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsProperty.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsPropertyWithoutType.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsPropertyWithoutType.descriptors.txt index adf41d085be..1a1a081cbc8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsPropertyWithoutType.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInAnnotationPrimaryConstructorAsPropertyWithoutType.descriptors.txt @@ -86,7 +86,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsProperty.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsProperty.descriptors.txt index 58c7e4e8070..4cdf8a12fc4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsProperty.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsProperty.descriptors.txt @@ -78,7 +78,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType.descriptors.txt index 69f2d51b001..dfd1ecc17ea 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType.descriptors.txt @@ -86,7 +86,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType2.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType2.descriptors.txt index 69f2d51b001..dfd1ecc17ea 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType2.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/varargInPrimaryConstructorAsPropertyWithoutType2.descriptors.txt @@ -86,7 +86,7 @@ KtConstructorSymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt index 8dcdb3a7215..7a5deffb740 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/primaryConstructorValueParameterAsProperty.descriptors.txt @@ -55,7 +55,7 @@ KtKotlinPropertySymbol: isDelegatedProperty: false isExpect: false isExtension: false - isFromPrimaryConstructor: false + isFromPrimaryConstructor: true isLateInit: false isOverride: false isStatic: false