From 4bd604f2ed1b506d804d7f3168674743a5e7c427 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 20 Oct 2022 12:01:10 +0200 Subject: [PATCH] [AA] check symbol pointer restoring without psi anchor ^KT-54311 --- .../KtFe10DescSyntheticFieldSymbol.kt | 6 +- .../test/cases/symbols/AbstractSymbolTest.kt | 100 +++++++++++++++--- .../pointers/KtPsiBasedSymbolPointer.kt | 27 ++++- .../scopes/memberScopeByFqName/enumEntry.kt | 1 + .../ClassWithGenericBase1.kt | 1 + .../ClassWithGenericBase2.kt | 1 + .../ClassWithGenericBase4.kt | 1 + .../GenericFromFunctionInLocalClass1.kt | 1 + .../GenericFromFunctionInLocalClass2.kt | 1 + .../GenericFromOuterClassInInnerClass1.kt | 1 + .../GenericFromOuterClassInInnerClass2.kt | 1 + ...mberPropertyWithOuterTypeParameterBound.kt | 1 + .../anonympuseObjectInInvalidPosition.kt | 1 + .../errors/objectWithTypeArgsAsExpression.kt | 1 + .../functionWithReceiverAnnotation.kt | 1 + .../getterWithAnnotations.kt | 1 + .../getterWithReceiverAndAnnotations.kt | 3 +- .../propertyWithAnnotations.kt | 1 + .../propertyWithAnnotationsAndAccessors.kt | 1 + .../propertyWithDelegateAndAnnotations.kt | 1 + .../propertyWithReceiverAnnotation.kt | 1 + .../setterWithAnnotations.kt | 1 + .../symbols/symbolByPsi/annotations.kt | 1 + .../symbols/symbolByPsi/anonymousObject.kt | 1 + .../symbols/symbolByPsi/backingField.kt | 1 + .../testData/symbols/symbolByPsi/class.kt | 1 + .../symbols/symbolByPsi/classInitializer.kt | 1 + .../symbols/symbolByPsi/classMembes.kt | 1 + .../symbolByPsi/classPrimaryConstructor.kt | 1 + .../symbolByPsi/classSecondaryConstructors.kt | 1 + .../symbolByPsi/classWithTypeParams.kt | 1 + .../contextReceiversOnClass.kt | 1 + .../contextReceiversOnFunction.kt | 1 + .../contextReceiversOnProperty.kt | 1 + .../symbols/symbolByPsi/delegateField.kt | 1 + .../symbols/symbolByPsi/deprecated.kt | 1 + .../symbolByPsi/destructuringDeclaration.kt | 1 + .../testData/symbols/symbolByPsi/dynamic.kt | 1 + .../testData/symbols/symbolByPsi/enum.kt | 1 + .../symbols/symbolByPsi/enumValueMember.kt | 1 + .../symbolByPsi/explicitBackingField.kt | 1 + .../symbols/symbolByPsi/extensionFunction.kt | 1 + .../symbols/symbolByPsi/forLoopVariable.kt | 1 + .../testData/symbols/symbolByPsi/function.kt | 1 + .../symbolByPsi/functionWithTypeParams.kt | 1 + .../implicitConstructorDelegationCall.kt | 1 + .../symbols/symbolByPsi/implicitReturn.kt | 1 + .../symbolByPsi/implicitReturnInLambda.kt | 1 + .../testData/symbols/symbolByPsi/jvmField.kt | 1 + .../testData/symbols/symbolByPsi/jvmName.kt | 1 + .../symbols/symbolByPsi/localDeclarations.kt | 1 + .../symbols/symbolByPsi/memberFunctions.kt | 1 + .../symbols/symbolByPsi/memberProperties.kt | 1 + .../symbolByPsi/outerAndInnerClasses.kt | 1 + .../symbols/symbolByPsi/topLevelFunctions.kt | 1 + .../symbols/symbolByPsi/topLevelProperties.kt | 1 + .../testData/symbols/symbolByPsi/typeAlias.kt | 1 + .../symbols/symbolByPsi/typeAnnotations.kt | 1 + .../valueParameters/parameterInlining.kt | 1 + .../symbols/symbolByPsi/varargFunctions.kt | 1 + .../symbolByReference/accessorField.kt | 1 + .../explicitLambdaParameter.kt | 1 + .../genericFromFunctionInLocalClass.kt | 1 + .../propertyReceiverParameter.kt | 1 + 64 files changed, 177 insertions(+), 19 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt index d8a8d44dc8c..8c264e6a4ee 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt @@ -46,8 +46,10 @@ internal class KtFe10DescSyntheticFieldSymbol( override fun createPointer(): KtSymbolPointer = withValidityAssertion { val accessorPsi = descriptor.containingDeclaration.toSourceElement.getPsi() if (accessorPsi is KtPropertyAccessor) { - val accessorPointer = KtPsiBasedSymbolPointer(accessorPsi.createSmartPointer()) - return KtFe10DescSyntheticFieldSymbolPointer(accessorPointer) + val accessorPointer = KtPsiBasedSymbolPointer.createForSymbolFromPsi(accessorPsi) + if (accessorPointer != null) { + return KtFe10DescSyntheticFieldSymbolPointer(accessorPointer) + } } return KtFe10NeverRestoringSymbolPointer() 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 f07529dded4..44382fe5be4 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 @@ -7,11 +7,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 +import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.symbols.SymbolTestDirectives.DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K2 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.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind @@ -20,7 +24,9 @@ import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.model.Directive +import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer +import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions @@ -42,19 +48,32 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val directives = module.directives - val directiveToIgnore = DO_NOT_CHECK_SYMBOL_RESTORE.takeIf { it in directives } - ?: 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 directiveToIgnoreSymbolRestore = directives.doNotCheckSymbolRestoreDirective() + val directiveToIgnoreNonPsiSymbolRestore = directives.doNotCheckNonPsiSymbolRestoreDirective() - val renderMode = directives[PRETTY_RENDERING_MODE].singleOrNull() - val prettyRenderOptions = when (renderMode ?: prettyRenderMode) { + val prettyRenderOptions = when (directives.singleOrZeroValue(PRETTY_RENDERING_MODE) ?: prettyRenderMode) { PrettyRenderingMode.RENDER_SYMBOLS_LINE_BY_LINE -> renderingOptions PrettyRenderingMode.RENDER_SYMBOLS_NESTED -> renderingOptions.copy(renderClassMembers = true) } - fun KtSymbol.safePointer(): KtSymbolPointer? { - val result = kotlin.runCatching { createPointer() } - return if (directiveToIgnore == null) result.getOrThrow() else result.getOrNull() + fun KtSymbol.safePointer(): PointerWrapper? { + val regularPointer = runCatching(::createPointer).let { + if (directiveToIgnoreSymbolRestore == null) it.getOrThrow() else it.getOrNull() + } ?: return null + + val nonPsiPointer = kotlin.runCatching { + if (this is KtFileSymbol) return@runCatching null + + KtPsiBasedSymbolPointer.withDisabledPsiBasedPointers(::createPointer) + } + + return PointerWrapper( + regularPointer = regularPointer, + pointerWithoutPsiAnchor = if (directiveToIgnoreSymbolRestore == null && directiveToIgnoreNonPsiSymbolRestore == null) + nonPsiPointer.getOrThrow() + else + nonPsiPointer.getOrNull(), + ) } val pointersWithRendered = executeOnPooledThreadInReadAction { @@ -93,9 +112,45 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { configurator.doOutOfBlockModification(ktFile) - restoreSymbolsInOtherReadActionAndCompareResults(directiveToIgnore, ktFile, pointersWithRendered.pointers, testServices) + restoreSymbolsInOtherReadActionAndCompareResults( + directiveToIgnore = directiveToIgnoreSymbolRestore, + pointerAccessor = PointerWrapper::regularPointer, + ktFile = ktFile, + pointersWithRendered = pointersWithRendered.pointers, + testServices = testServices, + ) + + if (directiveToIgnoreSymbolRestore == null) { + restoreSymbolsInOtherReadActionAndCompareResults( + directiveToIgnore = directiveToIgnoreNonPsiSymbolRestore, + pointerAccessor = PointerWrapper::pointerWithoutPsiAnchor, + ktFile = ktFile, + pointersWithRendered = pointersWithRendered.pointers, + testServices = testServices, + ) + } } + private fun RegisteredDirectives.doNotCheckSymbolRestoreDirective(): Directive? = findSpecificDirective( + commonDirective = DO_NOT_CHECK_SYMBOL_RESTORE, + k1Directive = DO_NOT_CHECK_SYMBOL_RESTORE_K1, + k2Directive = DO_NOT_CHECK_SYMBOL_RESTORE_K2, + ) + + private fun RegisteredDirectives.doNotCheckNonPsiSymbolRestoreDirective(): Directive? = findSpecificDirective( + commonDirective = DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE, + k1Directive = DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1, + k2Directive = DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K2, + ) + + private fun RegisteredDirectives.findSpecificDirective( + commonDirective: Directive, + k1Directive: Directive, + k2Directive: Directive, + ): Directive? = commonDirective.takeIf { it in this } + ?: k1Directive.takeIf { configurator.frontendKind == FrontendKind.Fe10 && it in this } + ?: k2Directive.takeIf { configurator.frontendKind == FrontendKind.Fir && it in this } + private fun compareResults( data: SymbolPointersData, testServices: TestServices, @@ -116,6 +171,7 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { private fun restoreSymbolsInOtherReadActionAndCompareResults( directiveToIgnore: Directive?, + pointerAccessor: (PointerWrapper) -> KtSymbolPointer?, ktFile: KtFile, pointersWithRendered: List, testServices: TestServices, @@ -123,12 +179,13 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { var failed = false try { val restored = analyseForTest(ktFile) { - pointersWithRendered.map { (pointer, expectedRender) -> - val restored = pointer!!.restoreSymbol() ?: error("Symbol $expectedRender was not restored") - + pointersWithRendered.map { (pointerWrapper, expectedRender) -> + val pointer = pointerWrapper?.let(pointerAccessor) ?: error("Symbol pointer for $expectedRender was not created") + val restored = pointer.restoreSymbol() ?: error("Symbol $expectedRender was not restored") renderSymbolForComparison(restored) } } + val actual = restored.renderAsDeclarations() testServices.assertions.assertEqualsToTestDataFileSibling(actual) } catch (e: Throwable) { @@ -164,6 +221,18 @@ object SymbolTestDirectives : SimpleDirectivesContainer() { description = "Symbol restoring for some symbols in current test is not supported yet in K2", ) + val DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE by directive( + description = "Symbol restoring w/o psi for some symbols in current test is not supported yet", + ) + + val DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 by directive( + description = "Symbol restoring w/o psi for some symbols in current test is not supported yet in K1", + ) + + val DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K2 by directive( + description = "Symbol restoring w/o psi 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) } } @@ -183,6 +252,11 @@ private data class SymbolPointersData( ) private data class PointerWithRenderedSymbol( - val pointer: KtSymbolPointer<*>?, + val pointer: PointerWrapper?, val rendered: String, ) + +private data class PointerWrapper( + val regularPointer: KtSymbolPointer<*>, + val pointerWithoutPsiAnchor: KtSymbolPointer<*>?, +) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt index 1ba9ffd634a..e3958e59193 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt @@ -1,11 +1,12 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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. */ package org.jetbrains.kotlin.analysis.api.symbols.pointers import com.intellij.psi.SmartPsiElementPointer +import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin @@ -15,7 +16,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtObjectLiteralExpression import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer -public class KtPsiBasedSymbolPointer(private val psiPointer: SmartPsiElementPointer) : +public class KtPsiBasedSymbolPointer private constructor(private val psiPointer: SmartPsiElementPointer) : KtSymbolPointer() { @Deprecated("Consider using org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol") override fun restoreSymbol(analysisSession: KtAnalysisSession): S? { @@ -35,7 +36,7 @@ public class KtPsiBasedSymbolPointer(private val psiPointer: Smart public companion object { public fun createForSymbolFromSource(symbol: S): KtPsiBasedSymbolPointer? { - if (symbol.origin != KtSymbolOrigin.SOURCE) return null + if (disablePsiPointer || symbol.origin != KtSymbolOrigin.SOURCE) return null val psi = when (val psi = symbol.psi) { is KtDeclaration -> psi @@ -46,5 +47,25 @@ public class KtPsiBasedSymbolPointer(private val psiPointer: Smart return KtPsiBasedSymbolPointer(psi.createSmartPointer()) } + + public fun createForSymbolFromPsi(ktElement: KtElement): KtPsiBasedSymbolPointer? { + if (disablePsiPointer) return null + + return KtPsiBasedSymbolPointer(ktElement.createSmartPointer()) + } + + @TestOnly + @Synchronized + public fun withDisabledPsiBasedPointers(action: () -> T): T { + disablePsiPointer = true + return try { + action() + } finally { + disablePsiPointer = false + } + } + + @Volatile + private var disablePsiPointer: Boolean = false } } diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt index 9abcb1f294e..e2004e4cd65 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test enum class E { diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt index 0771b8e3f9d..6a2f591be3d 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test class Foo diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt index 3053dd1dfc4..12c6809a3fc 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test class Foo diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt index 7285ae9db95..ecc7f851fe7 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test class SomeClass1 diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt index c0ba64c9b7e..d9c75c40f25 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // DO_NOT_CHECK_SYMBOL_RESTORE package test diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt index 735b5bef3f3..28f17b66c6c 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // DO_NOT_CHECK_SYMBOL_RESTORE package test diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt index 71b3434785c..507b41853cd 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test class SomeClass diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt index 460d01bd96f..7bf435d3bac 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test class SomeClass diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt index 044dd427e6d..b49d7b64ff1 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE package test interface ClassA diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt index 320e69b41f3..cadd822d8ac 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE private val _commonSettingsLazy: A = null = object : A { override fun x() {} } diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt index 98c603e8faf..1a21f741425 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE private val commonSettingsLazy = object A { println(x) } diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt index ce904537d1c..03fa4de90e8 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 annotation class ReceiverAnnotation @Target(AnnotationTarget.TYPE) annotation class ReceiverTypeAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.kt index f4cd9e9d688..c74a14bbed1 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class PropertyAnnotation annotation class FieldAnnotation annotation class GetAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.kt index b72f54b82ad..97b65d571bb 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/getterWithReceiverAndAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class PropertyAnnotation annotation class GetAnnotation annotation class ExplicitGetAnnotation @@ -9,4 +10,4 @@ annotation class ReceiverTypeAnnotation @property:PropertyAnnotation @get:GetAnnotation val @receiver:ReceiverAnnotation @ReceiverTypeAnnotation Long.x: Int - @ExplicitGetAnnotation get() = 1 \ No newline at end of file + @ExplicitGetAnnotation get() = 1 diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt index 04b1917ac13..a39a4c03c2f 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // WITH_STDLIB annotation class PropertyAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt index e580da844c6..1891ce8dfae 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // PRETTY_RENDERING_MODE: RENDER_SYMBOLS_NESTED annotation class PropertyAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt index 4b11ba96914..c63f13e17bb 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // WITH_STDLIB annotation class PropertyAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt index e7af085ebc4..3ecefccb1b5 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class ReceiverAnnotation @Target(AnnotationTarget.TYPE) annotation class ReceiverTypeAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.kt index 5adaef1eb9d..ba49978a47b 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/setterWithAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class PropertyAnnotation annotation class FieldAnnotation annotation class GetAnnotation diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt index 446669aebe0..512c7ff71b7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 annotation class Anno(val param1: String, val param2: Int) @Anno(param1 = "param", 2) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.kt index 2bbaf9df89e..cf4e927bec0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class AnonymousContainer { val anonymousObject = object : Runnable { override fun run() { diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.kt index 90b0ce76958..5dfe139284d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE var p: Int get() = field set(value) { diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/class.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/class.kt index 2e2439c32d0..52daf6bbb18 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/class.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/class.kt @@ -1,2 +1,3 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 class A { } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.kt index f937a0215d7..f2ae1e5d4d4 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class A { val i: Int init { diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.kt index 8b7100156db..ce5e0441b49 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class A { val a: Int = 10 fun x() = 10 diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt index 691f3b45825..f18d853c1b5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt @@ -1,2 +1,3 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 class A(val a: Int, b: String) { } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.kt index bb39198caad..9f77e129696 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 class A() { constructor(x: Int): this() constructor(y: Int, z: String) : this(y) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.kt index dd87a027404..7afa0bfc9d0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE import org.jetbrains.annotations.NotNull class A<@NotNull T, R> { } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.kt index 5779a458cd5..36ace6c97fb 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnClass.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE context(kotlin.Int, s@kotlin.String) class A { constructor(int: Int) {} diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.kt index b1c961d560a..27bb27ca973 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnFunction.kt @@ -1,2 +1,3 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 context(Int, s@String) fun y(){} \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.kt index 03e9a1b49e3..100dc82310e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.kt @@ -1,2 +1,3 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE context(Int, s@String) val y get() = 10 \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt index 80e7984b996..ad5b0bfe67e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // WITH_STDLIB class MyColor(val x: Int, val y: Int, val z: Int) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.kt index 3178e0579d1..a603aa899a8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // WITH_STDLIB @Deprecated("don't use i") diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt index 22f601b4bc0..f3a94ed445e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE data class P(val x: Int, val y: Int) fun destruct(): Int { diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.kt index b965de2ce5f..aa0f373b795 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class Foo { val p : dynamic = null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.kt index ed4965173ed..8936ae22339 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 enum class X { Y, Z; } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt index e735a67fc5f..f7d5cd49743 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE enum class Style(val value: String) { SHEET("foo") { override val exitAnimation: String diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.kt index bc9366f11cb..249116cb59e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE var p: Int field = "test" get() = field.length diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.kt index 81c3797cea3..9f63abc27e3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.kt @@ -1 +1,2 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 fun String.foo(): Int = 10 diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.kt index eb58fafb8c5..f08bfee70f0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE fun usage() { for (loopVariable in 1..10) {} } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.kt index d21bad75d96..8832eec1dc9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.kt @@ -1 +1,2 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 fun foo(x: Int) {} diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.kt index 4861780bb3c..ffb06c60cd0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.kt @@ -1 +1,2 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE fun foo(x: X) {} diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.kt index 3ad609286fa..6de6ecaa1b5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class A { constructor(i: Int) } diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.kt index bd9abd83b51..73414f86076 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.kt @@ -1 +1,2 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 fun foo(): Int = 10 diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt index 29635f9c05a..d9d92cd007e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE fun foo() { val lam1 = { a: Int -> val b = 1 diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.kt index 7d5117387af..aeb84449af8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // WITH_STDLIB @JvmField diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.kt index 6d8f477d325..e878443a05d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 // WITH_STDLIB class Foo { diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.kt index 2e0eb2ac6f9..7de4d779442 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE fun yyy() { val q = 10 fun aaa() {} diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.kt index 2ecf2a1079b..ceb34189dc3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 class A { fun x(): Int fun y() diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.kt index 5955c9dc1e1..525df8bcca9 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 class A { val x: Int = 10 val Int.y get() = this diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt index 3dabbcd3606..8f0d147bdca 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class X { inner class Y class Z diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.kt index 777288383d0..b25a82f90e0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.kt @@ -1,2 +1,3 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 fun x(): Int = 10 fun y() {} diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.kt index 6d54dc599d9..40b509edb96 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE val x: Int = 10 val Int.y get() = this diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.kt index a95de1efccf..cc49b8cd54c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE class X private typealias Y = X diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.kt index 10bb7974439..cfce5b21eb6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 @Target(AnnotationTarget.TYPE) annotation class Anno1 @Target(AnnotationTarget.TYPE) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.kt index 99381cff2c1..a4a1b16bbcf 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterInlining.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 inline fun foo( inlineParameter: () -> Int, crossinline crossinlineParameter: () -> Int, diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.kt index bd345e3042d..193223e2af5 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.kt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1 fun primitive(vararg a: Int) fun nullablePrimitive(vararg b: Float?) fun nonPrimitive(vararg c: Any) diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.kt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.kt index c01887e84bd..16ae0c8ba4a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.kt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class PropertyAnnotation annotation class FieldAnnotation annotation class GetAnnotation diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.kt b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.kt index d129bb0e5a2..ea03b4be79c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.kt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE inline fun T.use(block: (T) -> R): R { return block(this) } diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.kt b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.kt index 02fa570673d..29c4b57ccdc 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.kt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE // IGNORE_FE10 package test diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.kt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.kt index 7787745512b..b0735872852 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.kt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.kt @@ -1,3 +1,4 @@ +// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE annotation class ReceiverAnnotation @Target(AnnotationTarget.TYPE) annotation class ReceiverTypeAnnotation