azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Analysis API] fe10: count value classes in isInline

Browse Source 
#KT-63771 fixed


Merge-request: KT-MR-13220
Merged-by: Alexander Kuznetsov <Aleksander.Kuznetsov@jetbrains.com>
This commit is contained in:
Alexander Kuznetsov
2023-12-01 17:33:30 +00:00
committed by Space Team
parent 57bc120daf
commit e048d49bf0
11 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescNamedClassOrObjectSymbol.kt
+1 -1
View File
@@ -42,7 +42,7 @@ internal class KtFe10DescNamedClassOrObjectSymbol(
get() = withValidityAssertion { descriptor.isData }
override val isInline: Boolean
get() = withValidityAssertion { descriptor.isInline }
get() = withValidityAssertion { descriptor.isInline || descriptor.isValue }
override val isFun: Boolean
get() = withValidityAssertion { descriptor.isFun }
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiNamedClassOrObjectSymbol.kt
+1 -1
View File
@@ -56,7 +56,7 @@ internal class KtFe10PsiNamedClassOrObjectSymbol(
get() = withValidityAssertion { psi.hasModifier(KtTokens.DATA_KEYWORD) }
override val isInline: Boolean
get() = withValidityAssertion { psi.hasModifier(KtTokens.INLINE_KEYWORD) }
get() = withValidityAssertion { psi.hasModifier(KtTokens.INLINE_KEYWORD) || psi.hasModifier(KtTokens.VALUE_KEYWORD) }
override val isFun: Boolean
get() = withValidityAssertion { psi.hasModifier(KtTokens.FUN_KEYWORD) }
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java
Generated
+6
View File
@@ -202,6 +202,12 @@ public class Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated extends
runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsWithTypeAlias.kt");
}
@Test
@TestMetadata("valueClass.kt")
public void testValueClass() throws Exception {
runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/valueClass.kt");
}
@Nested
@TestMetadata("analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts")
@TestDataPath("$PROJECT_ROOT")
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiTestGenerated.java
Generated
+6
View File
@@ -202,6 +202,12 @@ public class Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiTestGenerated ext
runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsWithTypeAlias.kt");
}
@Test
@TestMetadata("valueClass.kt")
public void testValueClass() throws Exception {
runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/valueClass.kt");
}
@Nested
@TestMetadata("analysis/analysis-api/testData/symbols/singleSymbolByPsi/contracts")
@TestDataPath("$PROJECT_ROOT")