From 4d52b354af022077384fa8e20d6559bc03fcf0c6 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 14 Sep 2021 17:21:29 +0200 Subject: [PATCH] FIR IDE: move analysis api fir generator to the analysis directory --- .../analysis-api-fir-generator}/build.gradle.kts | 2 +- .../api/fir/generator/DiagnosticClassGenerator.kt | 8 ++++---- .../frontend/api/fir/generator/HLDiagnostic.kt | 2 +- .../api/fir/generator/HLDiagnosticConverter.kt | 8 ++++---- .../api/fir/generator/HLParameterConversion.kt | 2 +- .../kotlin/idea/frontend/api/fir/generator/Main.kt | 4 ++-- .../frontend/api/fir/generator/generatorUtils.kt | 2 +- .../AbstractDiagnosticsDataClassRenderer.kt | 10 +++++----- ...FirDiagnosticToKtDiagnosticConverterRenderer.kt | 10 +++++----- .../KtDiagnosticClassImplementationRenderer.kt | 14 +++++++------- .../rendererrs/KtDiagnosticClassRenderer.kt | 8 ++++---- generators/frontend-api-generator/build.gradle.kts | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/build.gradle.kts (93%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt (71%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt (94%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt (98%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt (98%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt (80%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt (95%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt (87%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt (87%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt (83%) rename {idea/idea-frontend-fir/idea-frontend-fir-generator => analysis/analysis-api-fir/analysis-api-fir-generator}/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt (88%) diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts similarity index 93% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts rename to analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts index 5d858f9e546..7d3cf8a8a51 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts @@ -29,7 +29,7 @@ val writeCopyright by task { } application { - mainClassName = "org.jetbrains.kotlin.idea.frontend.api.fir.generator.MainKt" + mainClassName = "org.jetbrains.kotlin.analysis.api.fir.generator.MainKt" } val processResources by tasks diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt similarity index 71% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt index 14e81d6745b..b7dd2c05f34 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.DiagnosticList import org.jetbrains.kotlin.fir.checkers.generator.getGenerationPath -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs.FirDiagnosticToKtDiagnosticConverterRenderer -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs.KtDiagnosticClassImplementationRenderer -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs.KtDiagnosticClassRenderer +import org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs.FirDiagnosticToKtDiagnosticConverterRenderer +import org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs.KtDiagnosticClassImplementationRenderer +import org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs.KtDiagnosticClassRenderer import java.nio.file.Path object DiagnosticClassGenerator { diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt similarity index 94% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt index 0a5b26b3807..38ee70bee44 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.DiagnosticData diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt similarity index 98% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt index 8c26cc049a1..5e619c24197 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import com.intellij.psi.PsiElement import org.jetbrains.kotlin.config.LanguageFeature @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.idea.frontend.api.symbols.* -import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.lexer.KtKeywordToken import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.name.ClassId @@ -204,7 +204,7 @@ private object FirToKtConversionCreator { KtNamedClassOrObjectSymbol::class.createType(), importsToAdd = listOf( "org.jetbrains.kotlin.fir.declarations.FirRegularClass", - "org.jetbrains.kotlin.idea.frontend.api.symbols.KtNamedClassOrObjectSymbol" + "org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol" ) ), FirExpression::class to HLFunctionCallConversion( diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt similarity index 98% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt index 28266402da1..fd6e7ac719a 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import kotlin.reflect.KType import kotlin.reflect.KTypeProjection diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt similarity index 80% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt index f7e4b64122d..71fa9c8c226 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DIAGNOSTICS_LIST import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.JVM_DIAGNOSTICS_LIST @@ -11,6 +11,6 @@ import java.nio.file.Paths fun main() { val rootPath = Paths.get("idea/idea-frontend-fir/src").toAbsolutePath() - val packageName = "org.jetbrains.kotlin.idea.frontend.api.fir.diagnostics" + val packageName = "org.jetbrains.kotlin.analysis.api.fir.diagnostics" DiagnosticClassGenerator.generate(rootPath, DIAGNOSTICS_LIST + JVM_DIAGNOSTICS_LIST, packageName) } diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt similarity index 95% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt index 760e7e21923..2a3e62a1698 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.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.fir.generator +package org.jetbrains.kotlin.analysis.api.fir.generator import org.jetbrains.kotlin.util.SmartPrinter import kotlin.reflect.KClass diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt similarity index 87% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt index 701a84c67d0..55b0e15c2cb 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.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.fir.generator.rendererrs +package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.DiagnosticList @@ -12,10 +12,10 @@ import org.jetbrains.kotlin.fir.checkers.generator.printImports import org.jetbrains.kotlin.fir.tree.generator.printer.printCopyright import org.jetbrains.kotlin.fir.tree.generator.printer.printGeneratedMessage import org.jetbrains.kotlin.fir.tree.generator.util.writeToFileUsingSmartPrinterIfFileContentChanged -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticConverter -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticList -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticParameter -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.simpleName +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticConverter +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticList +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticParameter +import org.jetbrains.kotlin.analysis.api.fir.generator.simpleName import org.jetbrains.kotlin.util.SmartPrinter import java.io.File import kotlin.reflect.KType diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt similarity index 87% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt index a2559876c35..76e5ac2edde 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.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.fir.generator.rendererrs +package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.ConversionContext -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnostic -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticList -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticParameter +import org.jetbrains.kotlin.analysis.api.fir.generator.ConversionContext +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnostic +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticList +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticParameter import org.jetbrains.kotlin.util.SmartPrinter import org.jetbrains.kotlin.util.withIndent diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt similarity index 83% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt index 2eda565d694..720cbac3755 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.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.fir.generator.rendererrs +package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnostic -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticList -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.HLDiagnosticParameter -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.printTypeWithShortNames +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnostic +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticList +import org.jetbrains.kotlin.analysis.api.fir.generator.HLDiagnosticParameter +import org.jetbrains.kotlin.analysis.api.fir.generator.printTypeWithShortNames import org.jetbrains.kotlin.util.SmartPrinter import org.jetbrains.kotlin.util.withIndent @@ -62,8 +62,8 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen } override val defaultImports = listOf( - "org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef", + "org.jetbrains.kotlin.analysis.api.fir.utils.weakRef", "org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic", - "org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken", + "org.jetbrains.kotlin.analysis.api.tokens.ValidityToken", ) } diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt similarity index 88% rename from idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt index 53f3da0c97c..34d6f7e0533 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.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.fir.generator.rendererrs +package org.jetbrains.kotlin.analysis.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.* -import org.jetbrains.kotlin.idea.frontend.api.fir.generator.printTypeWithShortNames +import org.jetbrains.kotlin.analysis.api.fir.generator.* +import org.jetbrains.kotlin.analysis.api.fir.generator.printTypeWithShortNames import org.jetbrains.kotlin.util.SmartPrinter object KtDiagnosticClassRenderer : AbstractDiagnosticsDataClassRenderer() { @@ -52,7 +52,7 @@ object KtDiagnosticClassRenderer : AbstractDiagnosticsDataClassRenderer() { } override val defaultImports = listOf( - "org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnosticWithPsi", + "org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi", "com.intellij.psi.PsiElement", ) } diff --git a/generators/frontend-api-generator/build.gradle.kts b/generators/frontend-api-generator/build.gradle.kts index 537316b4fbc..9c08a0622c8 100644 --- a/generators/frontend-api-generator/build.gradle.kts +++ b/generators/frontend-api-generator/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-spec")) testCompile(projectTests("::analysis:low-level-api-fir")) - testCompile(projectTests(":idea-frontend-fir")) + testCompile(projectTests(":analysis:analysis-api-fir")) testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } testApiJUnit5() }