Move ExceptionAttachmentBuilder near KotlinExceptionWithAttachments so it's accessible from KotlinExceptionWithAttachments

analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/ExceptionAttachmentBuilder.kt

@@ -1,124 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.utils.errors
-
-import com.intellij.openapi.diagnostic.Attachment
-import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter
-import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
-import org.jetbrains.kotlin.utils.SmartPrinter
-import org.jetbrains.kotlin.util.SourceCodeAnalysisException
-import org.jetbrains.kotlin.util.shouldIjPlatformExceptionBeRethrown
-import org.jetbrains.kotlin.utils.withIndent
-import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
-
-public class ExceptionAttachmentBuilder {
-    private val printer = SmartPrinter(StringBuilder())
-
-    public fun <T> withEntry(name: String, value: T, render: (T & Any) -> String) {
-        withEntry(name) {
-            appendLine("Class: ${value?.let { it::class.java.name } ?: "<null>"}")
-            appendLine("Value:")
-            withIndent {
-                appendLine(value?.let(render) ?: "<null>")
-            }
-        }
-    }
-
-    public fun withEntry(name: String, value: String?) {
-        with(printer) {
-            println("- $name:")
-            withIndent {
-                println(value ?: "<null>")
-            }
-            println(separator)
-        }
-    }
-
-    public fun withEntry(name: String, buildValue: PrettyPrinter.() -> Unit) {
-        withEntry(name, prettyPrint { buildValue() })
-    }
-
-    public fun withEntryGroup(groupName: String, build: ExceptionAttachmentBuilder.() -> Unit) {
-        val builder = ExceptionAttachmentBuilder().apply(build)
-        withEntry(groupName, builder) { it.buildString() }
-    }
-
-    public fun buildString(): String = printer.toString()
-
-    private companion object {
-        private const val separator = "========"
-    }
-}
-
-public inline fun KotlinExceptionWithAttachments.buildAttachment(
-    name: String = "info.txt",
-    buildContent: ExceptionAttachmentBuilder.() -> Unit
-): KotlinExceptionWithAttachments {
-    return withAttachment(name, ExceptionAttachmentBuilder().apply(buildContent).buildString())
-}
-
-public inline fun buildErrorWithAttachment(
-    message: String,
-    cause: Exception? = null,
-    attachmentName: String = "info.txt",
-    buildAttachment: ExceptionAttachmentBuilder.() -> Unit = {}
-): Nothing {
-    val exception = KotlinExceptionWithAttachments(message, cause)
-    exception.buildAttachment(attachmentName) { buildAttachment() }
-    throw exception
-}
-
-public inline fun Logger.logErrorWithAttachment(
-    message: String,
-    cause: Exception? = null,
-    attachmentName: String = "info.txt",
-    buildAttachment: ExceptionAttachmentBuilder.() -> Unit = {}
-) {
-    val attachment = Attachment(attachmentName, ExceptionAttachmentBuilder().apply(buildAttachment).buildString())
-    this.error(message, cause, attachment)
-}
-
-public inline fun rethrowExceptionWithDetails(
-    message: String,
-    exception: Exception,
-    attachmentName: String = "info.txt",
-    buildAttachment: ExceptionAttachmentBuilder.() -> Unit = {}
-): Nothing {
-    if (shouldIjPlatformExceptionBeRethrown(exception)) throw exception
-    val unwrappedException = if (exception is SourceCodeAnalysisException) exception.cause else exception
-    if (unwrappedException !is Exception) throw unwrappedException
-    buildErrorWithAttachment(message, unwrappedException, attachmentName, buildAttachment)
-}
-
-
-@OptIn(ExperimentalContracts::class)
-public inline fun checkWithAttachmentBuilder(
-    condition: Boolean,
-    message: () -> String,
-    buildAttachment: ExceptionAttachmentBuilder.() -> Unit = {}
-) {
-    contract { returns() implies (condition) }
-
-    if (!condition) {
-        buildErrorWithAttachment(message(), buildAttachment = buildAttachment)
-    }
-}
-
-@OptIn(ExperimentalContracts::class)
-public inline fun requireWithAttachmentBuilder(
-    condition: Boolean,
-    message: () -> String,
-    buildAttachment: ExceptionAttachmentBuilder.() -> Unit = {}
-) {
-    contract { returns() implies (condition) }
-
-    if (!condition) {
-        buildErrorWithAttachment(message(), buildAttachment = buildAttachment)
-    }
-}

analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/exceptionWithAttachmentBuilderHelpers.kt

@@ -10,6 +10,7 @@ import com.intellij.psi.PsiInvalidElementAccessException
 import org.jetbrains.kotlin.analysis.project.structure.KtModule
 import org.jetbrains.kotlin.analysis.utils.printer.getElementTextInContext
 import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.utils.exceptions.ExceptionAttachmentBuilder
 
 public fun ExceptionAttachmentBuilder.withPsiEntry(name: String, psi: PsiElement?, moduleFactory: (PsiElement) -> KtModule) {
     return withPsiEntry(name, psi, psi?.let(moduleFactory))

analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/unexpectedElementError.kt

@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.analysis.utils.errors
 
+import org.jetbrains.kotlin.utils.exceptions.buildErrorWithAttachment
+
 public fun unexpectedElementError(elementName: String, element: Any?): Nothing {
     buildErrorWithAttachment("Unexpected $elementName ${element?.let { it::class.simpleName }}") {
         withEntry(elementName, element) { element.toString() }