From 500295da6878798ef4451910a4b353a9e92ab554 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 27 May 2022 11:20:32 +0200 Subject: [PATCH] [references] move fe10 references implementation to another package --- .../configurator/AnalysisApiFe10TestServiceRegistrar.kt | 2 +- .../references => references/fe10}/Fe10KDocReference.kt | 6 +++--- .../fe10}/Fe10SyntheticPropertyAccessorReference.kt | 4 ++-- .../fe10}/KtFe10ArrayAccessReference.kt | 4 ++-- .../fe10}/KtFe10CollectionLiteralReference.kt | 6 +++--- .../fe10}/KtFe10ConstructorDelegationReference.kt | 6 +++--- .../fe10}/KtFe10DestructuringDeclarationEntry.kt | 6 +++--- .../fe10}/KtFe10ForLoopInReference.kt | 6 +++--- .../fe10}/KtFe10InvokeFunctionReference.kt | 6 +++--- .../fe10}/KtFe10PropertyDelegationMethodsReference.kt | 6 +++--- .../fe10}/KtFe10SimpleNameReference.kt | 8 ++++---- .../base/KtFe10KotlinReferenceProviderContributor.kt | 7 ++++--- .../fe10}/base/KtFe10PolyVariantResolver.kt | 6 +++--- .../fe10}/base/KtFe10Reference.kt | 4 ++-- .../fe10}/base/KtFe10ReferenceResolutionHelper.kt | 2 +- .../fe10}/util/DescriptorsToSourceUtilsIde.kt | 4 ++-- 16 files changed, 42 insertions(+), 41 deletions(-) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/Fe10KDocReference.kt (78%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/Fe10SyntheticPropertyAccessorReference.kt (94%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10ArrayAccessReference.kt (88%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10CollectionLiteralReference.kt (82%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10ConstructorDelegationReference.kt (80%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10DestructuringDeclarationEntry.kt (87%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10ForLoopInReference.kt (85%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10InvokeFunctionReference.kt (88%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10PropertyDelegationMethodsReference.kt (88%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/KtFe10SimpleNameReference.kt (91%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/base/KtFe10KotlinReferenceProviderContributor.kt (94%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/base/KtFe10PolyVariantResolver.kt (93%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/base/KtFe10Reference.kt (94%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/base/KtFe10ReferenceResolutionHelper.kt (96%) rename analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/{analysis/api/descriptors/references => references/fe10}/util/DescriptorsToSourceUtilsIde.kt (93%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestServiceRegistrar.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestServiceRegistrar.kt index 1bca0497a7b..80158364128 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestServiceRegistrar.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestServiceRegistrar.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.CliFe10AnalysisFacade import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisHandlerExtension import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSessionProvider -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10KotlinReferenceProviderContributor +import org.jetbrains.kotlin.references.fe10.base.KtFe10KotlinReferenceProviderContributor import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.cli.common.CliModuleVisibilityManagerImpl import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10KDocReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10KDocReference.kt similarity index 78% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10KDocReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10KDocReference.kt index 04f19bce26e..019929acb27 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10KDocReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10KDocReference.kt @@ -3,10 +3,10 @@ * 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10ReferenceResolutionHelper +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10ReferenceResolutionHelper import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KDocReference import org.jetbrains.kotlin.kdoc.psi.impl.KDocName diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10SyntheticPropertyAccessorReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt similarity index 94% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10SyntheticPropertyAccessorReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt index 06c708cf20e..c994452553a 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/Fe10SyntheticPropertyAccessorReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/Fe10SyntheticPropertyAccessorReference.kt @@ -3,12 +3,12 @@ * 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.util.SmartList -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.asJava.canHaveSyntheticGetter import org.jetbrains.kotlin.asJava.canHaveSyntheticSetter import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ArrayAccessReference.kt similarity index 88% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ArrayAccessReference.kt index 3ad3b4b369f..c897f722317 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ArrayAccessReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ArrayAccessReference.kt @@ -3,9 +3,9 @@ * 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtArrayAccessReference import org.jetbrains.kotlin.psi.KtArrayAccessExpression diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10CollectionLiteralReference.kt similarity index 82% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10CollectionLiteralReference.kt index cf14248fd74..3942b4bfc54 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10CollectionLiteralReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10CollectionLiteralReference.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtCollectionLiteralReference import org.jetbrains.kotlin.psi.KtCollectionLiteralExpression diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ConstructorDelegationReference.kt similarity index 80% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ConstructorDelegationReference.kt index 833e0acc03f..42537e14654 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ConstructorDelegationReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ConstructorDelegationReference.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.idea.references.KtConstructorDelegationReference import org.jetbrains.kotlin.psi.KtConstructorDelegationReferenceExpression import org.jetbrains.kotlin.psi.KtImportAlias diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10DestructuringDeclarationEntry.kt similarity index 87% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10DestructuringDeclarationEntry.kt index cda43c03245..caa41fdb24d 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10DestructuringDeclarationEntry.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10DestructuringDeclarationEntry.kt @@ -3,11 +3,11 @@ * 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 import com.intellij.openapi.util.TextRange -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10ReferenceResolutionHelper +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10ReferenceResolutionHelper import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ForLoopInReference.kt similarity index 85% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ForLoopInReference.kt index 8e3ff1993a8..cb13cf11e0b 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10ForLoopInReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10ForLoopInReference.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtForLoopInReference import org.jetbrains.kotlin.psi.KtForExpression diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10InvokeFunctionReference.kt similarity index 88% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10InvokeFunctionReference.kt index d93bf136cb6..ac3e5957a4a 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10InvokeFunctionReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10InvokeFunctionReference.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtInvokeFunctionReference import org.jetbrains.kotlin.psi.Call diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10PropertyDelegationMethodsReference.kt similarity index 88% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10PropertyDelegationMethodsReference.kt index 1d8a48bbd26..ad3d4b7906b 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10PropertyDelegationMethodsReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10PropertyDelegationMethodsReference.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptorWithAccessors import org.jetbrains.kotlin.descriptors.accessors diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt similarity index 91% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt index 35d37c3a5aa..67af4c1267f 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/KtFe10SimpleNameReference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt @@ -1,14 +1,14 @@ /* - * Copyright 2010-2021 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.descriptors.references +package org.jetbrains.kotlin.references.fe10 import com.intellij.psi.PsiElement import com.intellij.util.SmartList -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10Reference -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10ReferenceResolutionHelper +import org.jetbrains.kotlin.references.fe10.base.KtFe10Reference +import org.jetbrains.kotlin.references.fe10.base.KtFe10ReferenceResolutionHelper import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.readWriteAccess diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10KotlinReferenceProviderContributor.kt similarity index 94% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10KotlinReferenceProviderContributor.kt index d0de0c21640..34d8aae6c07 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10KotlinReferenceProviderContributor.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10KotlinReferenceProviderContributor.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 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.descriptors.references.base +package org.jetbrains.kotlin.references.fe10.base import com.intellij.psi.PsiReference -import org.jetbrains.kotlin.analysis.api.descriptors.references.* +import org.jetbrains.kotlin.references.fe10.* import org.jetbrains.kotlin.idea.references.KotlinPsiReferenceRegistrar import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor import org.jetbrains.kotlin.idea.references.KtDefaultAnnotationArgumentReference @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch import org.jetbrains.kotlin.psi.psiUtil.parents +import org.jetbrains.kotlin.references.fe10.* import org.jetbrains.kotlin.resolve.references.ReferenceAccess class KtFe10KotlinReferenceProviderContributor : KotlinReferenceProviderContributor { diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10PolyVariantResolver.kt similarity index 93% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10PolyVariantResolver.kt index d3cc72c1f97..9073be6cab5 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10PolyVariantResolver.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10PolyVariantResolver.kt @@ -1,16 +1,16 @@ /* - * Copyright 2010-2021 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.descriptors.references.base +package org.jetbrains.kotlin.references.fe10.base import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementResolveResult import com.intellij.psi.ResolveResult import com.intellij.psi.impl.source.resolve.ResolveCache -import org.jetbrains.kotlin.analysis.api.descriptors.references.util.DescriptorToSourceUtilsIde +import org.jetbrains.kotlin.references.fe10.util.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.idea.references.AbstractKtReference diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10Reference.kt similarity index 94% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10Reference.kt index 7c61c3bc72a..11f039e6401 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10Reference.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10Reference.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 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.descriptors.references.base +package org.jetbrains.kotlin.references.fe10.base import com.intellij.psi.PsiMethod import com.intellij.psi.impl.source.resolve.ResolveCache diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10ReferenceResolutionHelper.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10ReferenceResolutionHelper.kt similarity index 96% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10ReferenceResolutionHelper.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10ReferenceResolutionHelper.kt index f232b421ca0..e775f370e63 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/base/KtFe10ReferenceResolutionHelper.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/base/KtFe10ReferenceResolutionHelper.kt @@ -3,7 +3,7 @@ * 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.descriptors.references.base +package org.jetbrains.kotlin.references.fe10.base import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/util/DescriptorsToSourceUtilsIde.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/util/DescriptorsToSourceUtilsIde.kt similarity index 93% rename from analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/util/DescriptorsToSourceUtilsIde.kt rename to analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/util/DescriptorsToSourceUtilsIde.kt index f10400f061b..d5d21f6433a 100644 --- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/references/util/DescriptorsToSourceUtilsIde.kt +++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/util/DescriptorsToSourceUtilsIde.kt @@ -3,12 +3,12 @@ * 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.descriptors.references.util +package org.jetbrains.kotlin.references.fe10.util import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10ReferenceResolutionHelper +import org.jetbrains.kotlin.references.fe10.base.KtFe10ReferenceResolutionHelper import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.utils.addToStdlib.sequenceOfLazyValues