From 0c04ff98c3fe8e54667cd5a97a6bdaef43abf9e1 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 14 Sep 2021 15:58:04 +0200 Subject: [PATCH] FIR IDE: move analysis api to the analysis directory --- .../analysis-api}/build.gradle.kts | 0 .../kotlin/analysis}/api/ForbidKtResolve.kt | 2 +- .../api/ImplicitReceiverSmartCast.kt | 4 ++-- .../kotlin/analysis}/api/KtAnalysisSession.kt | 14 ++++++------- .../api/KtAnalysisSessionProvider.kt | 10 +++++----- .../analysis}/api/KtSymbolBasedReference.kt | 4 ++-- .../kotlin/analysis}/api/KtTypeArgument.kt | 6 +++--- .../api/NoWriteActionInAnalyseCallChecker.kt | 2 +- .../analysis}/api/ValidityTokenOwner.kt | 6 +++--- .../kotlin/analysis}/api/annotations.kt | 2 +- .../kotlin/analysis}/api/calls/KtCall.kt | 10 +++++----- .../kotlin/analysis}/api/calls/ktCallUtils.kt | 4 ++-- .../components/KtAnalysisSessionComponent.kt | 6 +++--- .../api/components/KtAnalysisSessionMixIn.kt | 4 ++-- .../api/components/KtCallResolver.kt | 4 ++-- .../KtCompileTimeConstantProvider.kt | 4 ++-- .../KtCompletionCandidateChecker.kt | 4 ++-- .../api/components/KtDiagnosticProvider.kt | 6 +++--- .../components/KtExpressionInfoProvider.kt | 4 ++-- .../components/KtExpressionTypeProvider.kt | 6 +++--- .../api/components/KtImportOptimizer.kt | 4 ++-- .../api/components/KtInheritorsProvider.kt | 6 +++--- .../api/components/KtJvmTypeMapper.kt | 4 ++-- .../api/components/KtOverrideInfoProvider.kt | 6 +++--- .../api/components/KtPsiTypeProvider.kt | 4 ++-- .../api/components/KtReferenceResolveMixIn.kt | 6 +++--- .../api/components/KtReferenceShortener.kt | 8 ++++---- .../analysis}/api/components/KtSamResolver.kt | 6 +++--- .../api/components/KtScopeProvider.kt | 20 +++++++++---------- .../api/components/KtSmartCastProvider.kt | 6 +++--- .../api/components/KtSubtypingComponent.kt | 4 ++-- .../KtSymbolContainingDeclarationProvider.kt | 4 ++-- .../KtSymbolDeclarationOverridesProvider.kt | 12 +++++------ .../KtSymbolDeclarationRendererProvider.kt | 6 +++--- .../api/components/KtSymbolInfoProvider.kt | 6 +++--- .../api/components/KtSymbolsMixIn.kt | 6 +++--- .../analysis}/api/components/KtTypeCreator.kt | 14 ++++++------- .../api/components/KtTypeInfoProvider.kt | 8 ++++---- .../api/components/KtTypeProvider.kt | 14 ++++++------- .../components/KtVisibilityCheckerMixIn.kt | 6 +++--- .../analysis}/api/diagnostics/KtDiagnostic.kt | 6 +++--- .../analysis}/api/scopes/KtImportingScope.kt | 2 +- .../kotlin/analysis}/api/scopes/KtScope.kt | 12 +++++------ .../api/symbols/DebugSymbolRenderer.kt | 10 +++++----- .../analysis}/api/symbols/KtCallableSymbol.kt | 8 ++++---- .../api/symbols/KtClassLikeSymbol.kt | 8 ++++---- .../analysis}/api/symbols/KtFileSymbol.kt | 6 +++--- .../api/symbols/KtFunctionLikeSymbol.kt | 6 +++--- .../analysis}/api/symbols/KtPackageSymbol.kt | 4 ++-- .../api/symbols/KtPropertyAccessorSymbol.kt | 6 +++--- .../kotlin/analysis}/api/symbols/KtSymbol.kt | 6 +++--- .../analysis}/api/symbols/KtSymbolProvider.kt | 6 +++--- .../api/symbols/KtVariableLikeSymbol.kt | 6 +++--- .../api/symbols/markers/KtAnnotatedSymbol.kt | 6 +++--- .../api/symbols/markers/KtConstantValue.kt | 2 +- .../symbols/markers/KtPossibleMemberSymbol.kt | 6 +++--- .../api/symbols/markers/KtSymbolWithKind.kt | 4 ++-- .../symbols/markers/KtSymbolWithMembers.kt | 4 ++-- .../symbols/markers/KtSymbolWithModality.kt | 4 ++-- .../symbols/markers/KtSymbolWithVisibility.kt | 4 ++-- .../symbols/markers/KtTypeAndAnnotations.kt | 6 +++--- .../analysis}/api/symbols/markers/markers.kt | 8 ++++---- .../pointers/KtPsiBasedSymbolPointer.kt | 10 +++++----- .../api/symbols/pointers/KtSymbolPointer.kt | 14 ++++++------- .../pointers/SymbolPointerExceptions.kt | 2 +- .../tokens/AlwaysAccessibleValidityToken.kt | 2 +- .../ReadActionConfinementValidityToken.kt | 4 ++-- .../analysis}/api/tokens/ValidityToken.kt | 2 +- .../kotlin/analysis}/api/types/KtType.kt | 10 +++++----- .../symbol-light-classes/build.gradle.kts | 2 +- build.gradle.kts | 2 +- idea/idea-frontend-fir/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../high-level-api-for-ide/build.gradle.kts | 2 +- settings.gradle | 3 +-- 75 files changed, 219 insertions(+), 220 deletions(-) rename {idea/idea-frontend-api => analysis/analysis-api}/build.gradle.kts (100%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/ForbidKtResolve.kt (94%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/ImplicitReceiverSmartCast.kt (78%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/KtAnalysisSession.kt (93%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/KtAnalysisSessionProvider.kt (95%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/KtSymbolBasedReference.kt (78%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/KtTypeArgument.kt (80%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/NoWriteActionInAnalyseCallChecker.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/ValidityTokenOwner.kt (76%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/annotations.kt (85%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/calls/KtCall.kt (91%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/calls/ktCallUtils.kt (87%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtAnalysisSessionComponent.kt (65%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtAnalysisSessionMixIn.kt (71%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtCallResolver.kt (92%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtCompileTimeConstantProvider.kt (82%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtCompletionCandidateChecker.kt (91%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtDiagnosticProvider.kt (85%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtExpressionInfoProvider.kt (89%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtExpressionTypeProvider.kt (95%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtImportOptimizer.kt (88%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtInheritorsProvider.kt (81%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtJvmTypeMapper.kt (87%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtOverrideInfoProvider.kt (93%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtPsiTypeProvider.kt (90%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtReferenceResolveMixIn.kt (81%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtReferenceShortener.kt (91%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSamResolver.kt (78%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtScopeProvider.kt (80%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSmartCastProvider.kt (82%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSubtypingComponent.kt (88%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSymbolContainingDeclarationProvider.kt (86%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSymbolDeclarationOverridesProvider.kt (86%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSymbolDeclarationRendererProvider.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSymbolInfoProvider.kt (92%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtSymbolsMixIn.kt (66%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtTypeCreator.kt (78%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtTypeInfoProvider.kt (95%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtTypeProvider.kt (88%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/components/KtVisibilityCheckerMixIn.kt (82%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/diagnostics/KtDiagnostic.kt (85%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/scopes/KtImportingScope.kt (95%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/scopes/KtScope.kt (89%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/DebugSymbolRenderer.kt (93%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtCallableSymbol.kt (68%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtClassLikeSymbol.kt (92%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtFileSymbol.kt (61%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtFunctionLikeSymbol.kt (93%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtPackageSymbol.kt (75%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtPropertyAccessorSymbol.kt (85%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtSymbol.kt (93%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtSymbolProvider.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/KtVariableLikeSymbol.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtAnnotatedSymbol.kt (83%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtConstantValue.kt (88%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtPossibleMemberSymbol.kt (62%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtSymbolWithKind.kt (79%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtSymbolWithMembers.kt (72%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtSymbolWithModality.kt (73%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtSymbolWithVisibility.kt (81%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/KtTypeAndAnnotations.kt (83%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/markers/markers.kt (67%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/pointers/KtPsiBasedSymbolPointer.kt (81%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/pointers/KtSymbolPointer.kt (71%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/symbols/pointers/SymbolPointerExceptions.kt (90%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/tokens/AlwaysAccessibleValidityToken.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/tokens/ReadActionConfinementValidityToken.kt (97%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/tokens/ValidityToken.kt (96%) rename {idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend => analysis/analysis-api/src/org/jetbrains/kotlin/analysis}/api/types/KtType.kt (88%) diff --git a/idea/idea-frontend-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts similarity index 100% rename from idea/idea-frontend-api/build.gradle.kts rename to analysis/analysis-api/build.gradle.kts diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ForbidKtResolve.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ForbidKtResolve.kt similarity index 94% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ForbidKtResolve.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ForbidKtResolve.kt index 4f0df8af355..47ec4bde44c 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ForbidKtResolve.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ForbidKtResolve.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api @RequiresOptIn public annotation class ForbidKtResolveInternals diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ImplicitReceiverSmartCast.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ImplicitReceiverSmartCast.kt similarity index 78% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ImplicitReceiverSmartCast.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ImplicitReceiverSmartCast.kt index f05a7937626..508b7af8fae 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ImplicitReceiverSmartCast.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ImplicitReceiverSmartCast.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtType public data class ImplicitReceiverSmartCast(val type: KtType, val kind: ImplicitReceiverSmartcastKind) diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt similarity index 93% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt index 00416eb72eb..9e07a513aa7 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt @@ -3,14 +3,14 @@ * 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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api -import org.jetbrains.kotlin.idea.frontend.api.components.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolProvider -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolProviderMixIn -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.api.components.* +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolProvider +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolProviderMixIn +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSessionProvider.kt similarity index 95% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSessionProvider.kt index 59e07136f1f..28791a046a6 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSessionProvider.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager @@ -13,10 +13,10 @@ import com.intellij.openapi.progress.Task import com.intellij.openapi.project.Project import com.intellij.openapi.util.Computable import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.tokens.AlwaysAccessibleValidityTokenFactory -import org.jetbrains.kotlin.idea.frontend.api.tokens.ReadActionConfinementValidityTokenFactory -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityTokenFactory +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.tokens.AlwaysAccessibleValidityTokenFactory +import org.jetbrains.kotlin.analysis.api.tokens.ReadActionConfinementValidityTokenFactory +import org.jetbrains.kotlin.analysis.api.tokens.ValidityTokenFactory import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtSymbolBasedReference.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtSymbolBasedReference.kt similarity index 78% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtSymbolBasedReference.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtSymbolBasedReference.kt index d86d3898523..5a700ba84ca 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtSymbolBasedReference.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtSymbolBasedReference.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.references.KtReference public interface KtSymbolBasedReference : KtReference { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtTypeArgument.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtTypeArgument.kt similarity index 80% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtTypeArgument.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtTypeArgument.kt index a594c3b6b59..ad07a515811 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtTypeArgument.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtTypeArgument.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.types.Variance public sealed class KtTypeArgument : ValidityTokenOwner { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/NoWriteActionInAnalyseCallChecker.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/NoWriteActionInAnalyseCallChecker.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/NoWriteActionInAnalyseCallChecker.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/NoWriteActionInAnalyseCallChecker.kt index ec38b878bc8..e2c2a360843 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/NoWriteActionInAnalyseCallChecker.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/NoWriteActionInAnalyseCallChecker.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationListener diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ValidityTokenOwner.kt similarity index 76% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ValidityTokenOwner.kt index 3de2d03faaa..85c45635aab 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/ValidityTokenOwner.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken -import org.jetbrains.kotlin.idea.frontend.api.tokens.assertIsValidAndAccessible +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.api.tokens.assertIsValidAndAccessible public interface ValidityTokenOwner { public val token: ValidityToken diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/annotations.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations.kt similarity index 85% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/annotations.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations.kt index 430f5a4a677..c9a70477e8d 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/annotations.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations.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.idea.frontend.api +package org.jetbrains.kotlin.analysis.api @RequiresOptIn public annotation class KtInternalApiMarker \ No newline at end of file diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/KtCall.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt similarity index 91% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/KtCall.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt index 72acb5a84c9..857eb10569d 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/KtCall.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.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.idea.frontend.api.calls +package org.jetbrains.kotlin.analysis.api.calls -import org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnostic -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtVariableLikeSymbol +import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnostic +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol import org.jetbrains.kotlin.psi.KtExpression /** diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/ktCallUtils.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/ktCallUtils.kt similarity index 87% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/ktCallUtils.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/ktCallUtils.kt index 1e19a3e3551..c0d5230b8ae 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/calls/ktCallUtils.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/ktCallUtils.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.idea.frontend.api.calls +package org.jetbrains.kotlin.analysis.api.calls -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol public fun KtCallTarget.getSuccessCallSymbolOrNull(): KtFunctionLikeSymbol? = when (this) { is KtSuccessCallTarget -> symbol diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionComponent.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionComponent.kt similarity index 65% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionComponent.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionComponent.kt index 2baef77bc1d..09dd1493b30 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionComponent.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionComponent.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner public abstract class KtAnalysisSessionComponent : ValidityTokenOwner { protected abstract val analysisSession: KtAnalysisSession diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionMixIn.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionMixIn.kt similarity index 71% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionMixIn.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionMixIn.kt index ea12b99ae3e..6e82e99e153 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtAnalysisSessionMixIn.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtAnalysisSessionMixIn.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession public interface KtAnalysisSessionMixIn { public val analysisSession: KtAnalysisSession diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCallResolver.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt similarity index 92% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCallResolver.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt index 022fb960f48..530de4a03ca 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCallResolver.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.calls.KtCall +import org.jetbrains.kotlin.analysis.api.calls.KtCall import org.jetbrains.kotlin.psi.* public abstract class KtCallResolver : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompileTimeConstantProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompileTimeConstantProvider.kt similarity index 82% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompileTimeConstantProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompileTimeConstantProvider.kt index cb7736c12b7..30c7a9f1d41 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompileTimeConstantProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompileTimeConstantProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSimpleConstantValue import org.jetbrains.kotlin.psi.KtExpression public abstract class KtCompileTimeConstantProvider : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompletionCandidateChecker.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompletionCandidateChecker.kt similarity index 91% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompletionCandidateChecker.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompletionCandidateChecker.kt index 73f0df7a834..9c28f0aa195 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtCompletionCandidateChecker.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCompletionCandidateChecker.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtSimpleNameExpression diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtDiagnosticProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtDiagnosticProvider.kt similarity index 85% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtDiagnosticProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtDiagnosticProvider.kt index db2768cfa21..1388f6842d9 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtDiagnosticProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtDiagnosticProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnostic -import org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnosticWithPsi +import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnostic +import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionInfoProvider.kt similarity index 89% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionInfoProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionInfoProvider.kt index 0c761919da9..a69959b6789 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionInfoProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionInfoProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import org.jetbrains.kotlin.diagnostics.WhenMissingCase -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.psi.KtReturnExpression import org.jetbrains.kotlin.psi.KtWhenExpression diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionTypeProvider.kt similarity index 95% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionTypeProvider.kt index ab81add3282..39a7b518335 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtExpressionTypeProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFunction @@ -54,7 +54,7 @@ public interface KtExpressionTypeProviderMixIn : KtAnalysisSessionMixIn { /** * Returns the expected [KtType] of this [PsiElement] if it is an expression. The returned value should not be a - * [org.jetbrains.kotlin.idea.frontend.api.types.KtClassErrorType]. + * [org.jetbrains.kotlin.analysis.api.types.KtClassErrorType]. */ public fun PsiElement.getExpectedType(): KtType? = analysisSession.expressionTypeProvider.getExpectedType(this) diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtImportOptimizer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtImportOptimizer.kt similarity index 88% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtImportOptimizer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtImportOptimizer.kt index e1bd1042964..a8845612a59 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtImportOptimizer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtImportOptimizer.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtImportDirective diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtInheritorsProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtInheritorsProvider.kt similarity index 81% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtInheritorsProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtInheritorsProvider.kt index 2f1d7759f7f..d0a1fa8c0f1 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtInheritorsProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtInheritorsProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtEnumEntrySymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtNamedClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol public abstract class KtInheritorsProvider : KtAnalysisSessionComponent() { public abstract fun getInheritorsOfSealedClass(classSymbol: KtNamedClassOrObjectSymbol): List diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtJvmTypeMapper.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtJvmTypeMapper.kt similarity index 87% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtJvmTypeMapper.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtJvmTypeMapper.kt index d821c6f16f8..b6882bd30b2 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtJvmTypeMapper.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtJvmTypeMapper.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.org.objectweb.asm.Type diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtOverrideInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtOverrideInfoProvider.kt similarity index 93% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtOverrideInfoProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtOverrideInfoProvider.kt index ac22cac642d..9178ee3ce86 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtOverrideInfoProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtOverrideInfoProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import org.jetbrains.kotlin.util.ImplementationStatus -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol public abstract class KtOverrideInfoProvider : KtAnalysisSessionComponent() { public abstract fun isVisible(memberSymbol: KtCallableSymbol, classSymbol: KtClassOrObjectSymbol): Boolean diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtPsiTypeProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtPsiTypeProvider.kt similarity index 90% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtPsiTypeProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtPsiTypeProvider.kt index 363ad34754b..8ff94885417 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtPsiTypeProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtPsiTypeProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import com.intellij.psi.PsiElement import com.intellij.psi.PsiType -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.load.kotlin.TypeMappingMode public abstract class KtPsiTypeProvider : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceResolveMixIn.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceResolveMixIn.kt similarity index 81% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceResolveMixIn.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceResolveMixIn.kt index bd3068c2569..3ba4d778718 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceResolveMixIn.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceResolveMixIn.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.KtSymbolBasedReference -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.KtSymbolBasedReference +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.references.KtReference public interface KtReferenceResolveMixIn : KtAnalysisSessionMixIn { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceShortener.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceShortener.kt similarity index 91% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceShortener.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceShortener.kt index 1bb3aefa518..20a973aa695 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtReferenceShortener.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceShortener.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import com.intellij.openapi.util.TextRange -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtEnumEntrySymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSamResolver.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSamResolver.kt similarity index 78% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSamResolver.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSamResolver.kt index 14afec980b4..f3d6a560423 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSamResolver.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSamResolver.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSamConstructorSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSamConstructorSymbol import org.jetbrains.kotlin.name.ClassId public abstract class KtSamResolver : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtScopeProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtScopeProvider.kt similarity index 80% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtScopeProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtScopeProvider.kt index f434e3bc063..1b311a85a24 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtScopeProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtScopeProvider.kt @@ -3,17 +3,17 @@ * 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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.scopes.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFileSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPackageSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithDeclarations -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithMembers -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.scopes.* +import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithDeclarations +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithMembers +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSmartCastProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSmartCastProvider.kt similarity index 82% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSmartCastProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSmartCastProvider.kt index ca6d9ccdf46..18598ccace2 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSmartCastProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSmartCastProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.ImplicitReceiverSmartCast -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.ImplicitReceiverSmartCast +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.psi.KtExpression public abstract class KtSmartCastProvider : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSubtypingComponent.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSubtypingComponent.kt similarity index 88% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSubtypingComponent.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSubtypingComponent.kt index 721217e9288..2f4388ec126 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSubtypingComponent.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSubtypingComponent.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtType public abstract class KtSubtypingComponent : KtAnalysisSessionComponent() { public abstract fun isEqualTo(first: KtType, second: KtType): Boolean diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolContainingDeclarationProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolContainingDeclarationProvider.kt similarity index 86% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolContainingDeclarationProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolContainingDeclarationProvider.kt index 5916cc33d8d..c3b8781b3a5 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolContainingDeclarationProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithKind +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind public abstract class KtSymbolContainingDeclarationProvider : KtAnalysisSessionComponent() { public abstract fun getContainingDeclaration(symbol: KtSymbolWithKind): KtSymbolWithKind? diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationOverridesProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationOverridesProvider.kt similarity index 86% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationOverridesProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationOverridesProvider.kt index 4600fb6a6a3..d8e095e1340 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationOverridesProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationOverridesProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol public abstract class KtSymbolDeclarationOverridesProvider : KtAnalysisSessionComponent() { public abstract fun getAllOverriddenSymbols(callableSymbol: T): List @@ -25,7 +25,7 @@ public interface KtSymbolDeclarationOverridesProviderMixIn : KtAnalysisSessionMi * * E.g, if we have `A.foo` overrides `B.foo` overrides `C.foo`, all two super declarations `B.foo`, `C.foo` will be returned * - * Unwraps substituted overridden symbols (see [org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin.INTERSECTION_OVERRIDE]) + * Unwraps substituted overridden symbols (see [org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin.INTERSECTION_OVERRIDE]) * * @see getDirectlyOverriddenSymbols */ @@ -37,7 +37,7 @@ public interface KtSymbolDeclarationOverridesProviderMixIn : KtAnalysisSessionMi ** * E.g, if we have `A.foo` overrides `B.foo` overrides `C.foo`, only declarations directly overridden `B.foo` will be returned * - * Unwraps substituted overridden symbols (see [org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin.INTERSECTION_OVERRIDE]) + * Unwraps substituted overridden symbols (see [org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin.INTERSECTION_OVERRIDE]) * * @see getAllOverriddenSymbols */ diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.kt index 863ff31b9df..6cdde8dc717 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolDeclarationRendererProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolDeclarationRendererProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.types.KtType /** * KtType to string renderer options diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolInfoProvider.kt similarity index 92% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolInfoProvider.kt index 40ff3829d44..98c65c4e549 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolInfoProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.name.Name public abstract class KtSymbolInfoProvider : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolsMixIn.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolsMixIn.kt similarity index 66% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolsMixIn.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolsMixIn.kt index 2c9a125b794..4ff9bd83b90 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolsMixIn.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolsMixIn.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer public interface KtSymbolsMixIn : KtAnalysisSessionMixIn { @Suppress("DEPRECATION") diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeCreator.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeCreator.kt similarity index 78% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeCreator.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeCreator.kt index eaa88bc9eaf..bd1f53e6fcb 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeCreator.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeCreator.kt @@ -3,14 +3,14 @@ * 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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgument -import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgumentWithVariance -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.KtClassType -import org.jetbrains.kotlin.idea.frontend.api.types.KtType -import org.jetbrains.kotlin.idea.frontend.api.types.KtTypeNullability +import org.jetbrains.kotlin.analysis.api.KtTypeArgument +import org.jetbrains.kotlin.analysis.api.KtTypeArgumentWithVariance +import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.types.KtClassType +import org.jetbrains.kotlin.analysis.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.types.Variance diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeInfoProvider.kt similarity index 95% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeInfoProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeInfoProvider.kt index f824286f587..a08d24ba4da 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeInfoProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeInfoProvider.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import org.jetbrains.kotlin.builtins.StandardNames -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtTypeAliasSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.* +import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtTypeAliasSymbol +import org.jetbrains.kotlin.analysis.api.types.* import org.jetbrains.kotlin.name.ClassId public abstract class KtTypeInfoProvider : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeProvider.kt similarity index 88% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeProvider.kt index 639e415294b..42db7d10b4b 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtTypeProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeProvider.kt @@ -3,13 +3,13 @@ * 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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtNamedClassOrObjectSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.KtFlexibleType -import org.jetbrains.kotlin.idea.frontend.api.types.KtType -import org.jetbrains.kotlin.idea.frontend.api.types.KtTypeNullability +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.types.KtFlexibleType +import org.jetbrains.kotlin.analysis.api.types.KtType +import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability import org.jetbrains.kotlin.psi.KtDoubleColonExpression import org.jetbrains.kotlin.psi.KtTypeReference @@ -37,7 +37,7 @@ public interface KtTypeProviderMixIn : KtAnalysisSessionMixIn { * Approximates [KtType] with the a supertype which can be rendered in a source code * * Return `null` if the type do not need approximation and can be rendered as is - * Otherwise, for type `T` return type `S` such `T <: S` and `T` and every it type argument is [org.jetbrains.kotlin.idea.frontend.api.types.KtDenotableType]` + * Otherwise, for type `T` return type `S` such `T <: S` and `T` and every it type argument is [org.jetbrains.kotlin.analysis.api.types.KtDenotableType]` */ public fun KtType.approximateToSuperPublicDenotable(): KtType? = analysisSession.typeProvider.approximateToSuperPublicDenotableType(this) diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtVisibilityCheckerMixIn.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtVisibilityCheckerMixIn.kt similarity index 82% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtVisibilityCheckerMixIn.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtVisibilityCheckerMixIn.kt index 542bd0bc2d5..058d858ca39 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtVisibilityCheckerMixIn.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtVisibilityCheckerMixIn.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.idea.frontend.api.components +package org.jetbrains.kotlin.analysis.api.components import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFileSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility +import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility import org.jetbrains.kotlin.psi.KtExpression public abstract class KtVisibilityChecker : KtAnalysisSessionComponent() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/diagnostics/KtDiagnostic.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/diagnostics/KtDiagnostic.kt similarity index 85% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/diagnostics/KtDiagnostic.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/diagnostics/KtDiagnostic.kt index e5f6a5294c4..a474f4d6ce9 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/diagnostics/KtDiagnostic.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/diagnostics/KtDiagnostic.kt @@ -3,13 +3,13 @@ * 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.idea.frontend.api.diagnostics +package org.jetbrains.kotlin.analysis.api.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner import kotlin.reflect.KClass public interface KtDiagnostic : ValidityTokenOwner { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtImportingScope.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtImportingScope.kt similarity index 95% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtImportingScope.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtImportingScope.kt index 0279ebca6e6..a1b99a51544 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtImportingScope.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtImportingScope.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.idea.frontend.api.scopes +package org.jetbrains.kotlin.analysis.api.scopes import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt similarity index 89% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt index a8b3bb6e8b6..3ccaaa21d74 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt @@ -3,13 +3,13 @@ * 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.idea.frontend.api.scopes +package org.jetbrains.kotlin.analysis.api.scopes -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.symbols.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithDeclarations -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithMembers -import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithDeclarations +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithMembers +import org.jetbrains.kotlin.analysis.api.withValidityAssertion import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt similarity index 93% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt index bf8101762d1..485b391e0c2 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt @@ -3,13 +3,13 @@ * 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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo -import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.components.KtSymbolInfoProviderMixIn -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.components.KtSymbolInfoProviderMixIn +import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtCallableSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt similarity index 68% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtCallableSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt index e7f9a2d352e..6cadbb389f2 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtCallableSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithKind -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.name.CallableId public abstract class KtCallableSymbol : KtSymbol, KtSymbolWithKind { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt similarity index 92% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt index 85dd8f9b7c3..baef6c0fd9f 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtClassLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFileSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFileSymbol.kt similarity index 61% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFileSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFileSymbol.kt index 749441fb276..725da3bf9a5 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFileSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFileSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotatedSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer public abstract class KtFileSymbol : KtAnnotatedSymbol { abstract override fun createPointer(): KtSymbolPointer diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt similarity index 93% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt index 8134f14f8cb..589bd6a5ff6 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPackageSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPackageSymbol.kt similarity index 75% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPackageSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPackageSymbol.kt index 823b5e49f53..0bdd0e00466 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPackageSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPackageSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.name.FqName public abstract class KtPackageSymbol : KtSymbol { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt similarity index 85% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt index 40ff117640d..454fe550959 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer public sealed class KtPropertyAccessorSymbol : KtFunctionLikeSymbol(), KtPossibleMemberSymbol, diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbol.kt similarity index 93% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbol.kt index 2e1c7cbea00..b14b170d53d 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer public interface KtSymbol : ValidityTokenOwner { public val origin: KtSymbolOrigin diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbolProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbolProvider.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbolProvider.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbolProvider.kt index 9f547dbd4d2..977d7fb29e4 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbolProvider.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSymbolProvider.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols -import org.jetbrains.kotlin.idea.frontend.api.components.KtAnalysisSessionComponent -import org.jetbrains.kotlin.idea.frontend.api.components.KtAnalysisSessionMixIn +import org.jetbrains.kotlin.analysis.api.components.KtAnalysisSessionComponent +import org.jetbrains.kotlin.analysis.api.components.KtAnalysisSessionMixIn import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt index e6fb54155d9..f6c3c706199 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.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.idea.frontend.api.symbols +package org.jetbrains.kotlin.analysis.api.symbols import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.StandardNames -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.markers.* +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtAnnotatedSymbol.kt similarity index 83% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtAnnotatedSymbol.kt index dd292581201..93f2d1284af 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtAnnotatedSymbol.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.KtCallElement diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtConstantValue.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtConstantValue.kt similarity index 88% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtConstantValue.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtConstantValue.kt index 68c47c84646..19542f0b972 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtConstantValue.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtConstantValue.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers import org.jetbrains.kotlin.types.ConstantValueKind diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt similarity index 62% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt index 79769d1d85f..e5d906f31ca 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.types.KtType public interface KtPossibleMemberSymbol : KtSymbol { public val dispatchType: KtType? diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithKind.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt similarity index 79% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithKind.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt index 828b0a5cb1c..ef82f16c089 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithKind.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithMembers.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithMembers.kt similarity index 72% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithMembers.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithMembers.kt index c58374bb367..4eec63cc775 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithMembers.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithMembers.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol public interface KtSymbolWithMembers : KtSymbolWithDeclarations diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithModality.kt similarity index 73% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithModality.kt index 995218ffc76..8078ee57d28 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithModality.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol public interface KtSymbolWithModality : KtSymbol { public val modality: Modality diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithVisibility.kt similarity index 81% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithVisibility.kt index 5ccaa54a53d..cba78819287 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithVisibility.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol public interface KtSymbolWithVisibility : KtSymbol { public val visibility: Visibility diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtTypeAndAnnotations.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtTypeAndAnnotations.kt similarity index 83% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtTypeAndAnnotations.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtTypeAndAnnotations.kt index dca2a9feaf4..bae30f2f8da 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtTypeAndAnnotations.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtTypeAndAnnotations.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.types.KtType public abstract class KtTypeAndAnnotations : ValidityTokenOwner { public abstract val type: KtType diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/markers.kt similarity index 67% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/markers.kt index 8a306723e88..67814566750 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/markers.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.idea.frontend.api.symbols.markers +package org.jetbrains.kotlin.analysis.api.symbols.markers -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtTypeParameterSymbol -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.name.Name public interface KtPossiblyNamedSymbol : KtSymbol { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtPsiBasedSymbolPointer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt similarity index 81% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtPsiBasedSymbolPointer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt index d610a8a38d0..d62686f0f29 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtPsiBasedSymbolPointer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtPsiBasedSymbolPointer.kt @@ -3,19 +3,19 @@ * 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.idea.frontend.api.symbols.pointers +package org.jetbrains.kotlin.analysis.api.symbols.pointers import com.intellij.psi.SmartPsiElementPointer -import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtObjectLiteralExpression import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer public class KtPsiBasedSymbolPointer(private val psiPointer: SmartPsiElementPointer) : KtSymbolPointer() { - @Deprecated("Consider using org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession.restoreSymbol") + @Deprecated("Consider using org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol") override fun restoreSymbol(analysisSession: KtAnalysisSession): S? { val psi = psiPointer.element ?: return null diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtSymbolPointer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtSymbolPointer.kt similarity index 71% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtSymbolPointer.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtSymbolPointer.kt index 1602e4d3917..921fbd8c45c 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/KtSymbolPointer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/KtSymbolPointer.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.idea.frontend.api.symbols.pointers +package org.jetbrains.kotlin.analysis.api.symbols.pointers -import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol /** * `KtSymbol` is valid only during read action it was created in @@ -21,20 +21,20 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol * * for class & type alias symbols if its qualified name was not changed * * for package symbol if the package is still exists * - * @see org.jetbrains.kotlin.idea.frontend.api.ReadActionConfinementValidityToken + * @see org.jetbrains.kotlin.analysis.api.ReadActionConfinementValidityToken */ public abstract class KtSymbolPointer { /** * @return restored symbol (possibly the new symbol instance) if one is still valid, `null` otherwise * - * Consider using [org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession.restoreSymbol] + * Consider using [org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol] */ - @Deprecated("Consider using org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession.restoreSymbol") + @Deprecated("Consider using org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol") public abstract fun restoreSymbol(analysisSession: KtAnalysisSession): S? } public inline fun symbolPointer(crossinline getSymbol: (KtAnalysisSession) -> S?): KtSymbolPointer = object : KtSymbolPointer() { - @Deprecated("Consider using org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession.restoreSymbol") + @Deprecated("Consider using org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol") override fun restoreSymbol(analysisSession: KtAnalysisSession): S? = getSymbol(analysisSession) } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/SymbolPointerExceptions.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/SymbolPointerExceptions.kt similarity index 90% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/SymbolPointerExceptions.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/SymbolPointerExceptions.kt index 79eb72d3fa2..585368d0ff4 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/pointers/SymbolPointerExceptions.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/pointers/SymbolPointerExceptions.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.idea.frontend.api.symbols.pointers +package org.jetbrains.kotlin.analysis.api.symbols.pointers public class CanNotCreateSymbolPointerForLocalLibraryDeclarationException(description: String) : IllegalStateException("Could not create a symbol pointer for local symbol $description") diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/AlwaysAccessibleValidityToken.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/AlwaysAccessibleValidityToken.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/AlwaysAccessibleValidityToken.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/AlwaysAccessibleValidityToken.kt index 668b8c1c353..01dfac006d2 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/AlwaysAccessibleValidityToken.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/AlwaysAccessibleValidityToken.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.idea.frontend.api.tokens +package org.jetbrains.kotlin.analysis.api.tokens import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ReadActionConfinementValidityToken.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ReadActionConfinementValidityToken.kt similarity index 97% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ReadActionConfinementValidityToken.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ReadActionConfinementValidityToken.kt index c8658ccfe64..eb7d40fb546 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ReadActionConfinementValidityToken.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ReadActionConfinementValidityToken.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.idea.frontend.api.tokens +package org.jetbrains.kotlin.analysis.api.tokens import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker -import org.jetbrains.kotlin.idea.frontend.api.* +import org.jetbrains.kotlin.analysis.api.* import kotlin.reflect.KClass public class ReadActionConfinementValidityToken(project: Project) : ValidityToken() { diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ValidityToken.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ValidityToken.kt similarity index 96% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ValidityToken.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ValidityToken.kt index 6f9e3b4fb51..c6317fdf6e4 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/tokens/ValidityToken.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/tokens/ValidityToken.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.idea.frontend.api.tokens +package org.jetbrains.kotlin.analysis.api.tokens import com.intellij.openapi.project.Project import kotlin.reflect.KClass diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtType.kt similarity index 88% rename from idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtType.kt index e001e9137d5..57021fb8a30 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/KtType.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtType.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.idea.frontend.api.types +package org.jetbrains.kotlin.analysis.api.types -import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgument -import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.KtTypeParameterSymbol +import org.jetbrains.kotlin.analysis.api.KtTypeArgument +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts index 8779171159d..6e0c6332572 100644 --- a/analysis/symbol-light-classes/build.gradle.kts +++ b/analysis/symbol-light-classes/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation(project(":core:compiler.common")) implementation(project(":compiler:light-classes")) implementation(project(":analysis:analysis-api-providers")) - implementation(project(":idea-frontend-api")) + implementation(project(":analysis:analysis-api")) implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) } } diff --git a/build.gradle.kts b/build.gradle.kts index 797267260c6..6b79f33c710 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -869,7 +869,7 @@ tasks { register("frontendApiTests") { dependsOn("dist") dependsOn( - ":idea-frontend-api:test", + ":analysis:analysis-api:test", ":idea-frontend-fir:test", ":idea-frontend-fir:idea-fir-low-level-api:test" ) diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts index 2ed03acf520..766fb48cca3 100644 --- a/idea/idea-frontend-fir/build.gradle.kts +++ b/idea/idea-frontend-fir/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { compile(project(":compiler:fir:checkers:checkers.jvm")) compile(project(":compiler:fir:java")) compile(project(":idea-frontend-fir:idea-fir-low-level-api")) - compile(project(":idea-frontend-api")) + compile(project(":analysis:analysis-api")) compile(project(":compiler:light-classes")) compile(intellijCoreDep()) implementation(project(":analysis:analysis-api-providers")) diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts b/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts index d173e0c77ab..5d858f9e546 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation(project(":compiler:fir:tree")) implementation(project(":compiler:fir:tree:tree-generator")) implementation(project(":compiler:fir:checkers:checkers-component-generator")) - implementation(project(":idea-frontend-api")) + implementation(project(":analysis:analysis-api")) implementation(project(":kotlin-reflect")) implementation(project(":kotlin-reflect-api")) diff --git a/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts index 0db4cb9b7ad..480e63a3d12 100644 --- a/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/high-level-api-for-ide/build.gradle.kts @@ -2,4 +2,4 @@ plugins { kotlin("jvm") } -publishJarsForIde(listOf(":idea-frontend-api")) +publishJarsForIde(listOf(":analysis:analysis-api")) diff --git a/settings.gradle b/settings.gradle index 5e5c1231d21..7352685586d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -447,7 +447,7 @@ include ":generators:frontend-api-generator", ":idea-frontend-fir:idea-fir-low-level-api", ":idea-frontend-fir:idea-frontend-fir-generator", ":idea-frontend-fir", - ":idea-frontend-api", + ":analysis:analysis-api", ":analysis:analysis-api-providers", ":analysis:symbol-light-classes" @@ -632,7 +632,6 @@ project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/ project(":idea-frontend-fir:idea-fir-low-level-api").projectDir = "$rootDir/idea/idea-frontend-fir/idea-fir-low-level-api" as File project(":idea-frontend-fir:idea-frontend-fir-generator").projectDir = "$rootDir/idea/idea-frontend-fir/idea-frontend-fir-generator" as File project(":idea-frontend-fir").projectDir = "$rootDir/idea/idea-frontend-fir" as File -project(":idea-frontend-api").projectDir = "$rootDir/idea/idea-frontend-api" as File project(':kotlin-scripting-ide-services-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-ide-services" as File project(':kotlin-scripting-ide-services-test').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-test" as File