From 4299794de21835ab0f9cb3a64455a55e3eb3c0df Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 26 Feb 2021 15:55:15 +0300 Subject: [PATCH] Move SmartPrinter to :core:compiler.common --- .../fir/checkers/generator/Generator.kt | 3 ++ .../fir/checkers/generator/ImportPrinter.kt | 34 +++++++++---------- .../ErrorListDiagnosticListRenderer.kt | 6 ++-- .../checkers/generator/smartPrinterUtils.kt | 6 ++-- .../kotlin/fir/checkers/generator/utils.kt | 2 +- .../fir/tree/generator/printer/builder.kt | 2 ++ .../fir/tree/generator/printer/element.kt | 2 ++ .../fir/tree/generator/printer/field.kt | 1 + .../tree/generator/printer/implementation.kt | 2 ++ .../kotlin/fir/tree/generator/printer/main.kt | 1 + .../fir/tree/generator/printer/transformer.kt | 2 ++ .../fir/tree/generator/printer/visitor.kt | 2 ++ .../kotlin/fir/tree/generator/util/util.kt | 10 +++++- .../jetbrains/kotlin/util}/SmartPrinter.kt | 11 ++---- .../api/fir/generator/generatorUtils.kt | 5 ++- .../AbstractDiagnosticsDataClassRenderer.kt | 6 ++-- ...agnosticToKtDiagnosticConverterRenderer.kt | 6 ++-- ...KtDiagnosticClassImplementationRenderer.kt | 7 ++-- .../rendererrs/KtDiagnosticClassRenderer.kt | 4 +-- 19 files changed, 63 insertions(+), 49 deletions(-) rename {compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer => core/compiler.common/src/org/jetbrains/kotlin/util}/SmartPrinter.kt (71%) diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Generator.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Generator.kt index c755a2c9996..2d54ceb3470 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Generator.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Generator.kt @@ -6,6 +6,9 @@ package org.jetbrains.kotlin.fir.checkers.generator import org.jetbrains.kotlin.fir.tree.generator.printer.* +import org.jetbrains.kotlin.fir.tree.generator.util.writeToFileUsingSmartPrinterIfFileContentChanged +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File private typealias Alias = String diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/ImportPrinter.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/ImportPrinter.kt index 69a52ac5c5a..62d3147fea0 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/ImportPrinter.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/ImportPrinter.kt @@ -5,27 +5,27 @@ package org.jetbrains.kotlin.fir.checkers.generator -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter +import org.jetbrains.kotlin.util.SmartPrinter private object ImportPrinter { - fun SmartPrinter.printImports(imports: Collection) { - val importsToPrint = imports.filterNot { it.isDefaultImport() }.distinct().sorted() - for (import in importsToPrint) { - println("import $import") - } - } + fun SmartPrinter.printImports(imports: Collection) { + val importsToPrint = imports.filterNot { it.isDefaultImport() }.distinct().sorted() + for (import in importsToPrint) { + println("import $import") + } + } - private fun String.isDefaultImport() = substringBeforeLast('.') in defaultImportedPackages + private fun String.isDefaultImport() = substringBeforeLast('.') in defaultImportedPackages - private val defaultImportedPackages = setOf( - "kotlin", - "kotlin.annotation", - "kotlin.collections", - "kotlin.ranges", - "kotlin.sequences", - "kotlin.text", - "kotlin.io", - ) + private val defaultImportedPackages = setOf( + "kotlin", + "kotlin.annotation", + "kotlin.collections", + "kotlin.ranges", + "kotlin.sequences", + "kotlin.text", + "kotlin.io", + ) } fun SmartPrinter.printImports(imports: Collection) { diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/ErrorListDiagnosticListRenderer.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/ErrorListDiagnosticListRenderer.kt index dc031991214..7663c34da10 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/ErrorListDiagnosticListRenderer.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/ErrorListDiagnosticListRenderer.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.checkers.generator.diagnostics import org.jetbrains.kotlin.fir.checkers.generator.* -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter 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.printer.writeToFileUsingSmartPrinterIfFileContentChanged +import org.jetbrains.kotlin.fir.tree.generator.util.writeToFileUsingSmartPrinterIfFileContentChanged +import org.jetbrains.kotlin.util.SmartPrinter import java.io.File import kotlin.reflect.KClass import kotlin.reflect.KType @@ -134,4 +134,4 @@ private inline fun SmartPrinter.printSeparatedWithComma(list: List, print print(", ") } } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/smartPrinterUtils.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/smartPrinterUtils.kt index 604d176b4f8..2103849febd 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/smartPrinterUtils.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/smartPrinterUtils.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.checkers.generator -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter -import org.jetbrains.kotlin.fir.tree.generator.printer.withIndent +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent inline fun SmartPrinter.inBracketsWithIndent(header: String = "", body: () -> Unit) { println("$header {") withIndent(body) println("}") -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/utils.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/utils.kt index 203734afc22..9344520885b 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/utils.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/utils.kt @@ -22,4 +22,4 @@ fun KType.collectClassNamesTo(set: MutableSet) { for (argument in arguments) { argument.type?.collectClassNamesTo(set) } -} \ No newline at end of file +} diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt index 3b2e3c5cac9..2b45012b1c5 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.declarationAttributesType import org.jetbrains.kotlin.fir.tree.generator.model.* +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File fun Builder.generateCode(generationPath: File): GeneratedFile { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt index 6dd34ae87a2..598aa939ab9 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt @@ -9,6 +9,8 @@ import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder import org.jetbrains.kotlin.fir.tree.generator.model.* import org.jetbrains.kotlin.fir.tree.generator.pureAbstractElementType import org.jetbrains.kotlin.fir.tree.generator.util.get +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt index 13768099167..285017bfc56 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.model.Field +import org.jetbrains.kotlin.util.SmartPrinter fun SmartPrinter.printField(field: Field, isImplementation: Boolean, override: Boolean, end: String) { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt index 5008e12f2e7..50ee479f9d3 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.model.* import org.jetbrains.kotlin.fir.tree.generator.pureAbstractElementType +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/main.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/main.kt index bea66e0830c..b7d926a5c82 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/main.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/main.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder +import org.jetbrains.kotlin.util.SmartPrinter import java.io.File private val COPYRIGHT = File("license/COPYRIGHT_HEADER.txt").readText() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt index 2b9565e36d4..02f79ac1f6f 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt @@ -8,6 +8,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.compositeTransformResultType import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder import org.jetbrains.kotlin.fir.tree.generator.model.Element +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt index 8d1fc2162be..2a5368108ca 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder import org.jetbrains.kotlin.fir.tree.generator.model.Element +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent import java.io.File fun printVisitor(elements: List, generationPath: File): GeneratedFile { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/util.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/util.kt index f6fa47393d7..60c6f198ea7 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/util.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/util.kt @@ -6,6 +6,9 @@ package org.jetbrains.kotlin.fir.tree.generator.util import org.jetbrains.kotlin.fir.tree.generator.model.Element +import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil +import org.jetbrains.kotlin.util.SmartPrinter +import java.io.File fun Element.traverseParents(block: (Element) -> Unit) { block(this) @@ -20,4 +23,9 @@ operator fun MutableMap>.set(k1: K, k2: V, value: operator fun Map>.get(k1: K, k2: V): U { return getValue(k1).getValue(k2) -} \ No newline at end of file +} + +inline fun File.writeToFileUsingSmartPrinterIfFileContentChanged(block: SmartPrinter.() -> Unit) { + val newText = buildString { SmartPrinter(this).block() } + GeneratorsFileUtil.writeFileIfContentChanged(this, newText, logNotChanged = false) +} diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/SmartPrinter.kt b/core/compiler.common/src/org/jetbrains/kotlin/util/SmartPrinter.kt similarity index 71% rename from compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/SmartPrinter.kt rename to core/compiler.common/src/org/jetbrains/kotlin/util/SmartPrinter.kt index 6d19739eef3..4bbb69d0cf0 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/SmartPrinter.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/util/SmartPrinter.kt @@ -1,12 +1,10 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.fir.tree.generator.printer +package org.jetbrains.kotlin.util -import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil -import java.io.File import java.lang.Appendable class SmartPrinter(appendable: Appendable) { @@ -49,8 +47,3 @@ inline fun SmartPrinter.withIndent(block: () -> Unit) { block() popIndent() } - -inline fun File.writeToFileUsingSmartPrinterIfFileContentChanged(block: SmartPrinter.() -> Unit) { - val newText = buildString { SmartPrinter(this).block() } - GeneratorsFileUtil.writeFileIfContentChanged(this, newText, logNotChanged = false) -} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt index c448277dbd2..0c3bd1f74a0 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt @@ -5,11 +5,10 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.generator -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter +import org.jetbrains.kotlin.util.SmartPrinter import kotlin.reflect.KClass import kotlin.reflect.KType - internal fun SmartPrinter.printTypeWithShortNames(type: KType) { print((type.classifier as KClass<*>).simpleName!!) if (type.arguments.isNotEmpty()) { @@ -22,4 +21,4 @@ internal fun SmartPrinter.printTypeWithShortNames(type: KType) { } print(">") } -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt index 516ccfd51c7..29c14a4e53d 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt @@ -9,13 +9,13 @@ import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticList import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticListRenderer import org.jetbrains.kotlin.fir.checkers.generator.printImports -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter 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.printer.writeToFileUsingSmartPrinterIfFileContentChanged +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.util.SmartPrinter import java.io.File abstract class AbstractDiagnosticsDataClassRenderer : DiagnosticListRenderer() { @@ -54,4 +54,4 @@ abstract class AbstractDiagnosticsDataClassRenderer : DiagnosticListRenderer() { protected abstract fun SmartPrinter.render(diagnosticList: HLDiagnosticList, packageName: String) protected abstract val defaultImports: Collection -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt index 27eaa69ae8b..1d6f2f6982b 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter -import org.jetbrains.kotlin.fir.tree.generator.printer.withIndent import org.jetbrains.kotlin.idea.frontend.api.fir.generator.* +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent object FirDiagnosticToKtDiagnosticConverterRenderer : AbstractDiagnosticsDataClassRenderer() { override fun SmartPrinter.render(diagnosticList: HLDiagnosticList, packageName: String) { @@ -64,4 +64,4 @@ object FirDiagnosticToKtDiagnosticConverterRenderer : AbstractDiagnosticsDataCla "org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic", "org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors", ) -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt index f3a2476308e..8e3a6bc1a91 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt @@ -6,12 +6,11 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter -import org.jetbrains.kotlin.fir.tree.generator.printer.withIndent import org.jetbrains.kotlin.idea.frontend.api.fir.generator.* import org.jetbrains.kotlin.idea.frontend.api.fir.generator.printTypeWithShortNames -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo +import org.jetbrains.kotlin.util.SmartPrinter +import org.jetbrains.kotlin.util.withIndent object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRenderer() { override fun SmartPrinter.render(diagnosticList: HLDiagnosticList, packageName: String) { @@ -63,4 +62,4 @@ object KtDiagnosticClassImplementationRenderer : AbstractDiagnosticsDataClassRen "org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic", "org.jetbrains.kotlin.idea.frontend.api.ValidityToken", ) -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt index 9c43f615fe6..a3992951861 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.generator.rendererrs import org.jetbrains.kotlin.fir.checkers.generator.collectClassNamesTo import org.jetbrains.kotlin.fir.checkers.generator.inBracketsWithIndent -import org.jetbrains.kotlin.fir.tree.generator.printer.SmartPrinter import org.jetbrains.kotlin.idea.frontend.api.fir.generator.* import org.jetbrains.kotlin.idea.frontend.api.fir.generator.printTypeWithShortNames +import org.jetbrains.kotlin.util.SmartPrinter object KtDiagnosticClassRenderer : AbstractDiagnosticsDataClassRenderer() { override fun SmartPrinter.render(diagnosticList: HLDiagnosticList, packageName: String) { @@ -53,4 +53,4 @@ object KtDiagnosticClassRenderer : AbstractDiagnosticsDataClassRenderer() { "org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnosticWithPsi", "com.intellij.psi.PsiElement", ) -} \ No newline at end of file +}