From a38e1747c37be5a975feb4fdbb89a85fa2dc7628 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 17 Oct 2022 14:05:51 +0200 Subject: [PATCH] [AA] split some SymbolByPsi tests on SingleSymbolByPsi to avoid redundant declarations ^KT-54311 --- ...ourceModuleSingleSymbolByPsiGenerated.java | 30 ++ ...sSourceModuleSymbolByPsiTestGenerated.java | 12 - ...ourceModuleSingleSymbolByPsiGenerated.java | 30 ++ ...sSourceModuleSymbolByPsiTestGenerated.java | 12 - .../symbols/AbstractSymbolByReferenceTest.kt | 3 +- .../test/cases/symbols/AbstractSymbolTest.kt | 6 +- ...ourceModuleSingleSymbolByPsiGenerated.java | 30 ++ ...sSourceModuleSymbolByPsiTestGenerated.java | 12 - ...hReceiverAnnotation.descriptors.pretty.txt | 1 + ...tionWithReceiverAnnotation.descriptors.txt | 28 ++ .../functionWithReceiverAnnotation.kt | 5 + .../functionWithReceiverAnnotation.pretty.txt | 1 + .../functionWithReceiverAnnotation.txt | 30 ++ ...ertyWithAnnotations.descriptors.pretty.txt | 2 + .../propertyWithAnnotations.descriptors.txt | 116 +++++++ .../propertyWithAnnotations.kt | 7 +- .../propertyWithAnnotations.pretty.txt | 3 + .../propertyWithAnnotations.txt | 118 +++++++ ...tationsAndAccessors.descriptors.pretty.txt | 8 + ...ithAnnotationsAndAccessors.descriptors.txt | 124 +++++++ .../propertyWithAnnotationsAndAccessors.kt | 23 ++ ...ertyWithAnnotationsAndAccessors.pretty.txt | 9 + .../propertyWithAnnotationsAndAccessors.txt | 126 +++++++ ...egateAndAnnotations.descriptors.pretty.txt | 3 + ...WithDelegateAndAnnotations.descriptors.txt | 54 +++ .../propertyWithDelegateAndAnnotations.kt | 10 + ...pertyWithDelegateAndAnnotations.pretty.txt | 4 + .../propertyWithDelegateAndAnnotations.txt | 56 +++ ...hReceiverAnnotation.descriptors.pretty.txt | 1 + ...ertyWithReceiverAnnotation.descriptors.txt | 55 +++ .../propertyWithReceiverAnnotation.kt} | 4 +- .../propertyWithReceiverAnnotation.pretty.txt | 1 + .../propertyWithReceiverAnnotation.txt | 59 ++++ ...ertyWithAnnotations.descriptors.pretty.txt | 20 -- .../propertyWithAnnotations.descriptors.txt | 319 ----------------- .../propertyWithAnnotations.pretty.txt | 22 -- .../symbolByPsi/propertyWithAnnotations.txt | 324 ------------------ .../receiverAnnotation.descriptors.pretty.txt | 8 - .../receiverAnnotation.descriptors.txt | 157 --------- .../symbolByPsi/receiverAnnotation.pretty.txt | 8 - .../symbolByPsi/receiverAnnotation.txt | 165 --------- 41 files changed, 936 insertions(+), 1070 deletions(-) create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt rename analysis/analysis-api/testData/symbols/{symbolByPsi => singleSymbolByPsi}/propertyWithAnnotations.kt (72%) create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.txt rename analysis/analysis-api/testData/symbols/{symbolByPsi/receiverAnnotation.kt => singleSymbolByPsi/propertyWithReceiverAnnotation.kt} (64%) create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt create mode 100644 analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.pretty.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.pretty.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.pretty.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.pretty.txt delete mode 100644 analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.txt diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java index 8d6136e1b74..efc216b4289 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java @@ -46,6 +46,36 @@ public class Fe10IdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated extends KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/symbols/singleSymbolByPsi"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @Test + @TestMetadata("functionWithReceiverAnnotation.kt") + public void testFunctionWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotations.kt") + public void testPropertyWithAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotationsAndAccessors.kt") + public void testPropertyWithAnnotationsAndAccessors() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt"); + } + + @Test + @TestMetadata("propertyWithDelegateAndAnnotations.kt") + public void testPropertyWithDelegateAndAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithReceiverAnnotation.kt") + public void testPropertyWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt"); + } + @Nested @TestMetadata("analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java index f7c022e45bb..d7c783da0df 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java @@ -220,18 +220,6 @@ public class Fe10IdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated extends A runTest("analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt"); } - @Test - @TestMetadata("propertyWithAnnotations.kt") - public void testPropertyWithAnnotations() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt"); - } - - @Test - @TestMetadata("receiverAnnotation.kt") - public void testReceiverAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt"); - } - @Test @TestMetadata("topLevelFunctions.kt") public void testTopLevelFunctions() throws Exception { diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java index ab6018ce12f..57914d72ff0 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java @@ -46,6 +46,36 @@ public class FirIdeNormalAnalysisSourceModuleSingleSymbolByPsiGenerated extends KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/symbols/singleSymbolByPsi"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @Test + @TestMetadata("functionWithReceiverAnnotation.kt") + public void testFunctionWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotations.kt") + public void testPropertyWithAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotationsAndAccessors.kt") + public void testPropertyWithAnnotationsAndAccessors() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt"); + } + + @Test + @TestMetadata("propertyWithDelegateAndAnnotations.kt") + public void testPropertyWithDelegateAndAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithReceiverAnnotation.kt") + public void testPropertyWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt"); + } + @Nested @TestMetadata("analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java index 12e0524f64a..456cd3ebdee 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java @@ -220,18 +220,6 @@ public class FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated extends Ab runTest("analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt"); } - @Test - @TestMetadata("propertyWithAnnotations.kt") - public void testPropertyWithAnnotations() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt"); - } - - @Test - @TestMetadata("receiverAnnotation.kt") - public void testReceiverAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt"); - } - @Test @TestMetadata("topLevelFunctions.kt") public void testTopLevelFunctions() throws Exception { 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 5d7c9ebd28f..3a982bb5de1 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 @@ -10,11 +10,12 @@ import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerPro 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 abstract class AbstractSymbolByReferenceTest : AbstractSymbolTest() { override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): SymbolsData { - val referenceExpression = testServices.expressionMarkerProvider.getElementOfTypeAtCaret(ktFile) + val referenceExpression = testServices.expressionMarkerProvider.getElementOfTypeAtCaret(ktFile) return SymbolsData( listOfNotNull(referenceExpression.mainReference.resolveToSymbol()) ) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt index d887fa68037..addb7b5e76b 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_SYMBOL_RESTORE import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_SYMBOL_RESTORE_K1 import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_SYMBOL_RESTORE_K2 +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.PRETTY_RENDERING_MODE import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest @@ -45,7 +46,8 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { ?: DO_NOT_CHECK_SYMBOL_RESTORE_K1.takeIf { configurator.frontendKind == FrontendKind.Fe10 && it in directives } ?: DO_NOT_CHECK_SYMBOL_RESTORE_K2.takeIf { configurator.frontendKind == FrontendKind.Fir && it in directives } - val prettyRenderOptions = when (prettyRenderMode) { + val renderMode = directives[PRETTY_RENDERING_MODE].singleOrNull() + val prettyRenderOptions = when (renderMode ?: prettyRenderMode) { PrettyRenderingMode.RENDER_SYMBOLS_LINE_BY_LINE -> renderingOptions PrettyRenderingMode.RENDER_SYMBOLS_NESTED -> renderingOptions.copy(renderClassMembers = true) } @@ -161,6 +163,8 @@ object SymbolTestDirectives : SimpleDirectivesContainer() { val DO_NOT_CHECK_SYMBOL_RESTORE_K2 by directive( description = "Symbol restoring for some symbols in current test is not supported yet in K2", ) + + val PRETTY_RENDERING_MODE by enumDirective(description = "Explicit rendering mode") { PrettyRenderingMode.valueOf(it) } } enum class PrettyRenderingMode { diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java index d51a91a4662..35289feb135 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSingleSymbolByPsiGenerated.java @@ -46,6 +46,36 @@ public class FirStandaloneNormalAnalysisSourceModuleSingleSymbolByPsiGenerated e KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/symbols/singleSymbolByPsi"), Pattern.compile("^(.+)\\.kt$"), null, true); } + @Test + @TestMetadata("functionWithReceiverAnnotation.kt") + public void testFunctionWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotations.kt") + public void testPropertyWithAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithAnnotationsAndAccessors.kt") + public void testPropertyWithAnnotationsAndAccessors() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt"); + } + + @Test + @TestMetadata("propertyWithDelegateAndAnnotations.kt") + public void testPropertyWithDelegateAndAnnotations() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt"); + } + + @Test + @TestMetadata("propertyWithReceiverAnnotation.kt") + public void testPropertyWithReceiverAnnotation() throws Exception { + runTest("analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt"); + } + @Nested @TestMetadata("analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java index 1cdc3b3be9f..70090824228 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated.java @@ -220,18 +220,6 @@ public class FirStandaloneNormalAnalysisSourceModuleSymbolByPsiTestGenerated ext runTest("analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt"); } - @Test - @TestMetadata("propertyWithAnnotations.kt") - public void testPropertyWithAnnotations() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt"); - } - - @Test - @TestMetadata("receiverAnnotation.kt") - public void testReceiverAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt"); - } - @Test @TestMetadata("topLevelFunctions.kt") public void testTopLevelFunctions() throws Exception { diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt new file mode 100644 index 00000000000..e0a354dd0c8 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt @@ -0,0 +1 @@ +fun (@ReceiverTypeAnnotation kotlin.Int).foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.txt new file mode 100644 index 00000000000..1e3569c71a9 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.txt @@ -0,0 +1,28 @@ +KtFunctionSymbol: + annotationsList: [] + callableIdIfNonLocal: /foo + contextReceivers: [] + hasStableParameterNames: true + isBuiltinFunctionInvoke: false + isExtension: true + isExternal: false + isInfix: false + isInline: false + isOperator: false + isOverride: false + isStatic: false + isSuspend: false + modality: FINAL + name: foo + origin: SOURCE + receiverType: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Int + returnType: kotlin/Unit + symbolKind: TOP_LEVEL + typeParameters: [] + valueParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt new file mode 100644 index 00000000000..ce904537d1c --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt @@ -0,0 +1,5 @@ +annotation class ReceiverAnnotation +@Target(AnnotationTarget.TYPE) +annotation class ReceiverTypeAnnotation + +fun @receiver:ReceiverAnnotation @ReceiverTypeAnnotation Int.foo() {} diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.pretty.txt new file mode 100644 index 00000000000..4b718272815 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.pretty.txt @@ -0,0 +1 @@ +fun @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Int.foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt new file mode 100644 index 00000000000..b87f5934c32 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.txt @@ -0,0 +1,30 @@ +KtFunctionSymbol: + annotationsList: [] + callableIdIfNonLocal: /foo + contextReceivers: [] + hasStableParameterNames: true + isBuiltinFunctionInvoke: false + isExtension: true + isExternal: false + isInfix: false + isInline: false + isOperator: false + isOverride: false + isStatic: false + isSuspend: false + modality: FINAL + name: foo + origin: SOURCE + receiverType: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Int + returnType: kotlin/Unit + symbolKind: TOP_LEVEL + typeParameters: [] + valueParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt new file mode 100644 index 00000000000..c3efbb7a804 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt @@ -0,0 +1,2 @@ +@PropertyAnnotation +var prop: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt new file mode 100644 index 00000000000..4aa58b7af32 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt @@ -0,0 +1,116 @@ +KtKotlinPropertySymbol: + annotationsList: [ + PropertyAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /prop + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [ + GetAnnotation() + psi: KtAnnotationEntry + ] + 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: true + initializer: KtConstantInitializerValue(1) + isConst: false + isDelegatedProperty: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: prop + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: KtPropertySetterSymbol: + annotationsList: [ + SetAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: false + hasStableParameterNames: true + isDefault: true + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + parameter: KtValueParameterSymbol: + annotationsList: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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 + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getProp + javaSetterName: setProp + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt similarity index 72% rename from analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt rename to analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt index 5ae5e6c2da1..04b1917ac13 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt @@ -11,9 +11,4 @@ annotation class SetparamAnnotation @get:GetAnnotation @set:SetAnnotation @setparam:SetparamAnnotation -var prop: Int = 1 - -annotation class DelegateAnnotation - -@delegate:DelegateAnnotation -val lazyProperty by lazy { 1 } +var prop: Int = 1 diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt new file mode 100644 index 00000000000..476e31cb197 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt @@ -0,0 +1,3 @@ +@PropertyAnnotation +@FieldAnnotation +var prop: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt new file mode 100644 index 00000000000..38c30ec38ca --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt @@ -0,0 +1,118 @@ +KtKotlinPropertySymbol: + annotationsList: [ + PropertyAnnotation() + psi: KtAnnotationEntry + FieldAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /prop + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [ + GetAnnotation() + psi: KtAnnotationEntry + ] + 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: true + initializer: KtConstantInitializerValue(1) + isConst: false + isDelegatedProperty: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: prop + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: KtPropertySetterSymbol: + annotationsList: [ + SetAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: false + hasStableParameterNames: true + isDefault: true + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + parameter: KtValueParameterSymbol: + annotationsList: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + generatedPrimaryConstructorProperty: null + hasDefaultValue: false + isCrossinline: false + isExtension: false + isImplicitLambdaParameter: false + isNoinline: false + isVararg: false + name: + origin: SOURCE + receiverType: null + returnType: kotlin/Int + symbolKind: LOCAL + typeParameters: [] + receiverType: null + returnType: kotlin/Unit + symbolKind: ACCESSOR + typeParameters: [] + valueParameters: [ + KtValueParameterSymbol: + annotationsList: [ + SetparamAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + generatedPrimaryConstructorProperty: null + hasDefaultValue: false + isCrossinline: false + isExtension: false + isImplicitLambdaParameter: false + isNoinline: false + isVararg: false + name: + origin: SOURCE + receiverType: null + returnType: kotlin/Int + symbolKind: LOCAL + typeParameters: [] + ] + visibility: Public + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getProp + javaSetterName: setProp + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt new file mode 100644 index 00000000000..6eff8943ddd --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt @@ -0,0 +1,8 @@ +@PropertyAnnotation +var x: kotlin.Int + @GetAnnotation + @ExplicitGetAnnotation + get() + @SetAnnotation + @ExplicitSetAnnotation + set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt new file mode 100644 index 00000000000..2a9e6f4c95e --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt @@ -0,0 +1,124 @@ +KtKotlinPropertySymbol: + annotationsList: [ + PropertyAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /x + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [ + GetAnnotation() + psi: KtAnnotationEntry + ExplicitGetAnnotation() + 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 + hasBackingField: true + hasGetter: true + hasSetter: true + initializer: KtConstantInitializerValue(0) + isConst: false + isDelegatedProperty: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: x + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: KtPropertySetterSymbol: + annotationsList: [ + SetAnnotation() + psi: KtAnnotationEntry + ExplicitSetAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: true + hasStableParameterNames: true + isDefault: false + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + parameter: KtValueParameterSymbol: + annotationsList: [ + ExplicitSetparamAnnotation() + psi: KtAnnotationEntry + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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: [ + ExplicitSetparamAnnotation() + psi: KtAnnotationEntry + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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 + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getX + javaSetterName: setX + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt new file mode 100644 index 00000000000..e580da844c6 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt @@ -0,0 +1,23 @@ +// PRETTY_RENDERING_MODE: RENDER_SYMBOLS_NESTED + +annotation class PropertyAnnotation +annotation class FieldAnnotation +annotation class GetAnnotation +annotation class SetAnnotation +annotation class SetparamAnnotation +annotation class ExplicitGetAnnotation +annotation class ExplicitSetAnnotation +annotation class ExplicitSetparamAnnotation + +@property:PropertyAnnotation +@field:FieldAnnotation +@get:GetAnnotation +@set:SetAnnotation +@setparam:SetparamAnnotation +var x: Int = 0 + @ExplicitGetAnnotation + get() = field + @ExplicitSetAnnotation + set(@ExplicitSetparamAnnotation value) { + field = value + } diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt new file mode 100644 index 00000000000..34307d36543 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt @@ -0,0 +1,9 @@ +@PropertyAnnotation +@FieldAnnotation +var x: kotlin.Int + @ExplicitGetAnnotation + @GetAnnotation + get() + @ExplicitSetAnnotation + @SetAnnotation + set(@ExplicitSetparamAnnotation @SetparamAnnotation value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt new file mode 100644 index 00000000000..b76a2b717e8 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt @@ -0,0 +1,126 @@ +KtKotlinPropertySymbol: + annotationsList: [ + PropertyAnnotation() + psi: KtAnnotationEntry + FieldAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /x + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [ + ExplicitGetAnnotation() + psi: KtAnnotationEntry + GetAnnotation() + 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 + hasBackingField: true + hasGetter: true + hasSetter: true + initializer: KtConstantInitializerValue(0) + isConst: false + isDelegatedProperty: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: x + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: KtPropertySetterSymbol: + annotationsList: [ + ExplicitSetAnnotation() + psi: KtAnnotationEntry + SetAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: true + hasStableParameterNames: true + isDefault: false + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + parameter: KtValueParameterSymbol: + annotationsList: [ + ExplicitSetparamAnnotation() + psi: KtAnnotationEntry + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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: [ + ExplicitSetparamAnnotation() + psi: KtAnnotationEntry + SetparamAnnotation() + psi: KtAnnotationEntry + ] + 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 + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getX + javaSetterName: setX + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.pretty.txt new file mode 100644 index 00000000000..aa28a0f32ec --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.pretty.txt @@ -0,0 +1,3 @@ +@PropertyAnnotation +@ExplicitPropertyAnnotation +val lazyProperty: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt new file mode 100644 index 00000000000..8bb08bfddb6 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt @@ -0,0 +1,54 @@ +KtKotlinPropertySymbol: + annotationsList: [ + PropertyAnnotation() + psi: KtAnnotationEntry + ExplicitPropertyAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /lazyProperty + 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: false + hasGetter: true + hasSetter: false + initializer: null + isConst: false + isDelegatedProperty: true + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: lazyProperty + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: null + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getLazyProperty + javaSetterName: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt new file mode 100644 index 00000000000..4b11ba96914 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt @@ -0,0 +1,10 @@ +// WITH_STDLIB + +annotation class PropertyAnnotation +annotation class ExplicitPropertyAnnotation +annotation class DelegateAnnotation + +@property:ExplicitPropertyAnnotation +@delegate:DelegateAnnotation +@PropertyAnnotation +val lazyProperty by lazy { 1 } diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt new file mode 100644 index 00000000000..e15641e20f9 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt @@ -0,0 +1,4 @@ +@ExplicitPropertyAnnotation +@DelegateAnnotation +@PropertyAnnotation +val lazyProperty: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt new file mode 100644 index 00000000000..356ae9ffe38 --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt @@ -0,0 +1,56 @@ +KtKotlinPropertySymbol: + annotationsList: [ + ExplicitPropertyAnnotation() + psi: KtAnnotationEntry + DelegateAnnotation() + psi: KtAnnotationEntry + PropertyAnnotation() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /lazyProperty + contextReceivers: [] + getter: 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 + hasBackingField: false + hasGetter: true + hasSetter: false + initializer: null + isConst: false + isDelegatedProperty: true + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: lazyProperty + origin: SOURCE + receiverType: null + returnType: kotlin/Int + setter: null + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getLazyProperty + javaSetterName: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt new file mode 100644 index 00000000000..083096b703b --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt @@ -0,0 +1 @@ +val (@ReceiverTypeAnnotation kotlin.Long).prop: kotlin.Boolean \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.txt new file mode 100644 index 00000000000..bb10428d73b --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.txt @@ -0,0 +1,55 @@ +KtKotlinPropertySymbol: + annotationsList: [] + callableIdIfNonLocal: /prop + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: true + hasStableParameterNames: true + isDefault: false + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + receiverType: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long + returnType: kotlin/Boolean + 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: prop + origin: SOURCE + receiverType: [ + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @R|ReceiverTypeAnnotation|() kotlin/Long + returnType: kotlin/Boolean + setter: null + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getProp + javaSetterName: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt similarity index 64% rename from analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt rename to analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt index 73144778dc5..e7af085ebc4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt @@ -2,6 +2,4 @@ annotation class ReceiverAnnotation @Target(AnnotationTarget.TYPE) annotation class ReceiverTypeAnnotation -fun @receiver:ReceiverAnnotation @ReceiverTypeAnnotation Int.foo() {} - -val @receiver:ReceiverAnnotation @ReceiverTypeAnnotation Long.prop: Boolean get() = true +val @receiver:ReceiverAnnotation @ReceiverTypeAnnotation Long.prop: Boolean get() = true diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt new file mode 100644 index 00000000000..99c5b8b07de --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt @@ -0,0 +1 @@ +val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt new file mode 100644 index 00000000000..f99d6735cbb --- /dev/null +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt @@ -0,0 +1,59 @@ +KtKotlinPropertySymbol: + annotationsList: [] + callableIdIfNonLocal: /prop + contextReceivers: [] + getter: KtPropertyGetterSymbol: + annotationsList: [] + callableIdIfNonLocal: null + contextReceivers: [] + hasBody: true + hasStableParameterNames: true + isDefault: false + isExtension: false + isInline: false + isOverride: false + modality: FINAL + origin: SOURCE + receiverType: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Long + returnType: kotlin/Boolean + 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: prop + origin: SOURCE + receiverType: [ + ReceiverAnnotation() + psi: KtAnnotationEntry + ReceiverTypeAnnotation() + psi: KtAnnotationEntry + ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Long + returnType: kotlin/Boolean + setter: null + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + getContainingModule: KtSourceModule "Sources of main" + deprecationStatus: null + getterDeprecationStatus: null + javaGetterName: getProp + javaSetterName: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.pretty.txt deleted file mode 100644 index 73fdb95564a..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.pretty.txt +++ /dev/null @@ -1,20 +0,0 @@ -@PropertyAnnotation -var prop: kotlin.Int - @GetAnnotation - get() - @SetAnnotation - set(@SetparamAnnotation value: kotlin.Int) - -val lazyProperty: kotlin.Int - -annotation class PropertyAnnotation - -annotation class FieldAnnotation - -annotation class GetAnnotation - -annotation class SetAnnotation - -annotation class SetparamAnnotation - -annotation class DelegateAnnotation \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt deleted file mode 100644 index 8a6f2be33e9..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.descriptors.txt +++ /dev/null @@ -1,319 +0,0 @@ -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: PropertyAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: PropertyAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: FieldAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: FieldAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: GetAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: GetAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: SetAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: SetAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: SetparamAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: SetparamAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [ - PropertyAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: /prop - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [ - GetAnnotation() - psi: KtAnnotationEntry - ] - 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: true - initializer: KtConstantInitializerValue(1) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: false - modality: FINAL - name: prop - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: KtPropertySetterSymbol: - annotationsList: [ - SetAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [ - SetparamAnnotation() - psi: KtAnnotationEntry - ] - 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: [ - SetparamAnnotation() - psi: KtAnnotationEntry - ] - 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 - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getProp - javaSetterName: setProp - setterDeprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: DelegateAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: DelegateAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtAnonymousFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasStableParameterNames: true - isExtension: false - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - valueParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /lazyProperty - 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: false - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: true - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: lazyProperty - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getLazyProperty - javaSetterName: null - setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.pretty.txt deleted file mode 100644 index 16c71fdbfac..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.pretty.txt +++ /dev/null @@ -1,22 +0,0 @@ -@PropertyAnnotation -@FieldAnnotation -var prop: kotlin.Int - @GetAnnotation - get() - @SetAnnotation - set(@SetparamAnnotation value: kotlin.Int) - -@DelegateAnnotation -val lazyProperty: kotlin.Int - -annotation class PropertyAnnotation - -annotation class FieldAnnotation - -annotation class GetAnnotation - -annotation class SetAnnotation - -annotation class SetparamAnnotation - -annotation class DelegateAnnotation \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.txt deleted file mode 100644 index 3d1e2ad2f72..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/propertyWithAnnotations.txt +++ /dev/null @@ -1,324 +0,0 @@ -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: PropertyAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: PropertyAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: FieldAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: FieldAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: GetAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: GetAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: SetAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: SetAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: SetparamAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: SetparamAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [ - PropertyAnnotation() - psi: KtAnnotationEntry - FieldAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: /prop - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [ - GetAnnotation() - psi: KtAnnotationEntry - ] - 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: true - initializer: KtConstantInitializerValue(1) - isConst: false - isDelegatedProperty: false - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: false - modality: FINAL - name: prop - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: KtPropertySetterSymbol: - annotationsList: [ - SetAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: false - hasStableParameterNames: true - isDefault: true - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - parameter: KtValueParameterSymbol: - annotationsList: [ - SetparamAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - receiverType: null - returnType: kotlin/Unit - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [ - KtValueParameterSymbol: - annotationsList: [ - SetparamAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: null - contextReceivers: [] - generatedPrimaryConstructorProperty: null - hasDefaultValue: false - isCrossinline: false - isExtension: false - isImplicitLambdaParameter: false - isNoinline: false - isVararg: false - name: - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - ] - visibility: Public - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getProp - javaSetterName: setProp - setterDeprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: DelegateAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: DelegateAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtAnonymousFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasStableParameterNames: true - isExtension: false - origin: SOURCE - receiverType: null - returnType: kotlin/Int - symbolKind: LOCAL - typeParameters: [] - valueParameters: [] - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [ - DelegateAnnotation() - psi: KtAnnotationEntry - ] - callableIdIfNonLocal: /lazyProperty - contextReceivers: [] - getter: 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 - hasBackingField: false - hasGetter: true - hasSetter: false - initializer: null - isConst: false - isDelegatedProperty: true - isExtension: false - isFromPrimaryConstructor: false - isLateInit: false - isOverride: false - isStatic: false - isVal: true - modality: FINAL - name: lazyProperty - origin: SOURCE - receiverType: null - returnType: kotlin/Int - setter: null - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getLazyProperty - javaSetterName: null - setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.pretty.txt deleted file mode 100644 index 1f7ee2e0a45..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.pretty.txt +++ /dev/null @@ -1,8 +0,0 @@ -fun (@ReceiverTypeAnnotation kotlin.Int).foo() - -val (@ReceiverTypeAnnotation kotlin.Long).prop: kotlin.Boolean - -annotation class ReceiverAnnotation - -@kotlin.annotation.Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) -annotation class ReceiverTypeAnnotation \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.txt deleted file mode 100644 index 590f0d1ad28..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.descriptors.txt +++ /dev/null @@ -1,157 +0,0 @@ -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: ReceiverAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: ReceiverAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [ - kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) - psi: KtAnnotationEntry - ] - classIdIfNonLocal: ReceiverTypeAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: ReceiverTypeAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: /foo - contextReceivers: [] - hasStableParameterNames: true - isBuiltinFunctionInvoke: false - isExtension: true - isExternal: false - isInfix: false - isInline: false - isOperator: false - isOverride: false - isStatic: false - isSuspend: false - modality: FINAL - name: foo - origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Int - returnType: kotlin/Unit - symbolKind: TOP_LEVEL - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /prop - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - 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: prop - origin: SOURCE - receiverType: [ - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - setter: null - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getProp - javaSetterName: null - setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.pretty.txt deleted file mode 100644 index 53fe3dbae5a..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.pretty.txt +++ /dev/null @@ -1,8 +0,0 @@ -fun @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Int.foo() - -val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean - -annotation class ReceiverAnnotation - -@kotlin.annotation.Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) -annotation class ReceiverTypeAnnotation \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.txt deleted file mode 100644 index 8c6e496a874..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/receiverAnnotation.txt +++ /dev/null @@ -1,165 +0,0 @@ -KtNamedClassOrObjectSymbol: - annotationsList: [] - classIdIfNonLocal: ReceiverAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: ReceiverAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtNamedClassOrObjectSymbol: - annotationsList: [ - kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) - psi: KtAnnotationEntry - ] - classIdIfNonLocal: ReceiverTypeAnnotation - classKind: ANNOTATION_CLASS - companionObject: null - contextReceivers: [] - isData: false - isExternal: false - isFun: false - isInline: false - isInner: false - modality: FINAL - name: ReceiverTypeAnnotation - origin: SOURCE - superTypes: [ - kotlin/Annotation - ] - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtFunctionSymbol: - annotationsList: [] - callableIdIfNonLocal: /foo - contextReceivers: [] - hasStableParameterNames: true - isBuiltinFunctionInvoke: false - isExtension: true - isExternal: false - isInfix: false - isInline: false - isOperator: false - isOverride: false - isStatic: false - isSuspend: false - modality: FINAL - name: foo - origin: SOURCE - receiverType: [ - ReceiverAnnotation() - psi: KtAnnotationEntry - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Int - returnType: kotlin/Unit - symbolKind: TOP_LEVEL - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: [ - ReceiverAnnotation() - psi: KtAnnotationEntry - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - symbolKind: ACCESSOR - typeParameters: [] - valueParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - -KtKotlinPropertySymbol: - annotationsList: [] - callableIdIfNonLocal: /prop - contextReceivers: [] - getter: KtPropertyGetterSymbol: - annotationsList: [] - callableIdIfNonLocal: null - contextReceivers: [] - hasBody: true - hasStableParameterNames: true - isDefault: false - isExtension: false - isInline: false - isOverride: false - modality: FINAL - origin: SOURCE - receiverType: [ - ReceiverAnnotation() - psi: KtAnnotationEntry - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - 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: prop - origin: SOURCE - receiverType: [ - ReceiverAnnotation() - psi: KtAnnotationEntry - ReceiverTypeAnnotation() - psi: KtAnnotationEntry - ] @RECEIVER:R|ReceiverAnnotation|() @R|ReceiverTypeAnnotation|() kotlin/Long - returnType: kotlin/Boolean - setter: null - symbolKind: TOP_LEVEL - typeParameters: [] - visibility: Public - getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null - getterDeprecationStatus: null - javaGetterName: getProp - javaSetterName: null - setterDeprecationStatus: null \ No newline at end of file